diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 13:43:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:43:54 -0400 |
| commit | 0291928abb27aceda429088eede903604a1e9bbd (patch) | |
| tree | 4f6efed902d338c8b8eb7fdb79247b29e2551e9a /.cirrus.yml | |
| parent | 1b8d0e454353224a571bcec7d37240140ec7917f (diff) | |
| parent | 330e9144bd49a090484ade39339b3c3453253105 (diff) | |
| download | podman-0291928abb27aceda429088eede903604a1e9bbd.tar.gz podman-0291928abb27aceda429088eede903604a1e9bbd.tar.bz2 podman-0291928abb27aceda429088eede903604a1e9bbd.zip | |
Merge pull request #7033 from rhatdan/v2.0
[2.0] 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 046213b3e..af28b823b 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 @@ -486,7 +486,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 |