diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 05:54:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 05:54:57 -0400 |
| commit | df6920aa79073b2767d24c6524367384b6284b31 (patch) | |
| tree | b56fdbd8b13f4edf3c3e0638b0f970533157d50b /.cirrus.yml | |
| parent | 1682e60dac14d9f32ae02c5f3286b3309cd9b128 (diff) | |
| parent | 841eac0af651d7afa4749a65f4e773815b5c715c (diff) | |
| download | podman-df6920aa79073b2767d24c6524367384b6284b31.tar.gz podman-df6920aa79073b2767d24c6524367384b6284b31.tar.bz2 podman-df6920aa79073b2767d24c6524367384b6284b31.zip | |
Merge pull request #7009 from rhatdan/containers.conf
Switch references from libpod.conf to containers.conf
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ccc78717e..b1aa1b475 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -61,7 +61,7 @@ env: SPECIALMODE: "none" # don't do anything special TEST_REMOTE_CLIENT: 'false' # don't test remote client by default ADD_SECOND_PARTITION: 'false' # will certainly fail inside containers - MOD_LIBPOD_CONF: 'true' # Update libpod.conf runtime if required by OS environment + MOD_CONTAINERS_CONF: 'true' # Update containers.conf runtime if required by OS environment #### #### Credentials and other secret-sauces, decrypted at runtime when authorized. @@ -286,7 +286,7 @@ build_each_commit_task: memory: "8Gb" env: - MOD_LIBPOD_CONF: 'false' + MOD_CONTAINERS_CONF: 'false' timeout_in: 30m @@ -318,7 +318,7 @@ build_without_cgo_task: memory: "8Gb" env: - MOD_LIBPOD_CONF: 'false' + MOD_CONTAINERS_CONF: 'false' timeout_in: 30m @@ -512,7 +512,7 @@ special_testing_in_podman_task: env: ADD_SECOND_PARTITION: 'true' - MOD_LIBPOD_CONF: 'false' # Use existing/native setup + MOD_CONTAINERS_CONF: 'false' # Use existing/native setup SPECIALMODE: 'in_podman' # See docs timeout_in: 60m |