diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-11 02:15:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 02:15:51 +0100 |
| commit | 28029fbc619876e50ab5a44536cb091b1dacb7b8 (patch) | |
| tree | c8e9aa9c21e55fc35242cf67be502154f2d9fe0c /.cirrus.yml | |
| parent | 94b784255cf849c6d9024def6355fc1cf67c8cbf (diff) | |
| parent | ba00eb5eb9113d120ea85771bf67c9dec2b1eca5 (diff) | |
| download | podman-28029fbc619876e50ab5a44536cb091b1dacb7b8.tar.gz podman-28029fbc619876e50ab5a44536cb091b1dacb7b8.tar.bz2 podman-28029fbc619876e50ab5a44536cb091b1dacb7b8.zip | |
Merge pull request #4670 from mheon/backports_for_164
Backports for v1.6.4
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index d5e221a4f..b29d4269c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,7 @@ env: ### _BUILT_IMAGE_SUFFIX: "libpod-5642998972416000" FEDORA_CACHE_IMAGE_NAME: "fedora-30-${_BUILT_IMAGE_SUFFIX}" - PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-${_BUILT_IMAGE_SUFFIX}" + # PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-${_BUILT_IMAGE_SUFFIX}" SPECIAL_FEDORA_CACHE_IMAGE_NAME: "xfedora-30-${_BUILT_IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-19-${_BUILT_IMAGE_SUFFIX}" PRIOR_UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-${_BUILT_IMAGE_SUFFIX}" @@ -273,7 +273,7 @@ meta_task: # Space-separated list of images used by this repository state IMGNAMES: >- ${FEDORA_CACHE_IMAGE_NAME} - ${PRIOR_FEDORA_CACHE_IMAGE_NAME} + # ${PRIOR_FEDORA_CACHE_IMAGE_NAME} ${SPECIAL_FEDORA_CACHE_IMAGE_NAME} ${UBUNTU_CACHE_IMAGE_NAME} ${PRIOR_UBUNTU_CACHE_IMAGE_NAME} @@ -332,7 +332,7 @@ testing_task: matrix: # Images are generated separately, from build_images_task (below) image_name: "${FEDORA_CACHE_IMAGE_NAME}" - image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}" + # image_name: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}" # Multiple test failures on Ubuntu 19 - Fixes TBD in future PR # TODO: image_name: "${UBUNTU_CACHE_IMAGE_NAME}" image_name: "${PRIOR_UBUNTU_CACHE_IMAGE_NAME}" |