diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 15:50:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-24 15:50:39 +0200 |
commit | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (patch) | |
tree | 50fcb41590d74293fda6147b24a10945a5d4aec0 /.cirrus.yml | |
parent | 33280d881e1bd838cf5e346e5c338a3dc992b345 (diff) | |
parent | a06bb80b4b4b9e286fac292e80d30840878ea3f1 (diff) | |
download | podman-cf244d87cdb9b2cb0d8510b2ea392d928c1eb269.tar.gz podman-cf244d87cdb9b2cb0d8510b2ea392d928c1eb269.tar.bz2 podman-cf244d87cdb9b2cb0d8510b2ea392d928c1eb269.zip |
Merge pull request #3398 from haircommander/conmon-hotfix
Update conmon to include attach socket unlink
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 c1b05c1bf..e90712309 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,9 +29,9 @@ env: #### #### Cache-image names to test with ### - FEDORA_CACHE_IMAGE_NAME: "fedora-30-libpod-5156500369047552" - PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5156500369047552" - UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5156500369047552" + FEDORA_CACHE_IMAGE_NAME: "fedora-30-libpod-5699414987898880" + PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5699414987898880" + UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5699414987898880" #### #### Variables for composing new cache-images (used in PR testing) from @@ -41,7 +41,7 @@ env: # Git commits to use while building dependencies into cache-images FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554" CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" - CONMON_COMMIT: "8455ce1ef385120deb827d0f0588c04357bad4c4" + CONMON_COMMIT: "3e47d8dd45cdd973dbe256292d5e9c0bff195e56" CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" # Special image w/ nested-libvirt + tools for creating new cache and base images IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1541772081" |