summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-31 20:01:06 +0100
committerGitHub <noreply@github.com>2019-10-31 20:01:06 +0100
commit0bfdeae6ddfab22990eaa472317d65e79a222db3 (patch)
tree9c47fbba910fbc3ef19c454b8b4d6a4e1c0e1180
parentffe36ea9964242235571ad1d21a0c4d825ef5971 (diff)
parent0e74207fd6644d1a24eddeb1b0761a45a106e312 (diff)
downloadpodman-0bfdeae6ddfab22990eaa472317d65e79a222db3.tar.gz
podman-0bfdeae6ddfab22990eaa472317d65e79a222db3.tar.bz2
podman-0bfdeae6ddfab22990eaa472317d65e79a222db3.zip
Merge pull request #4384 from cevich/turn_off_f29
Cirrus: Disable F29 testing
-rw-r--r--.cirrus.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 0713f6dda..fe7a1c332 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-30-${_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}"
@@ -331,7 +331,7 @@ testing_task:
gce_instance:
matrix:
# Images are generated separately, from build_images_task (below)
- image_name: "${FEDORA_CACHE_IMAGE_NAME}"
+ #image_name: "${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}"
@@ -589,8 +589,8 @@ verify_test_built_images_task:
TEST_REMOTE_CLIENT: false
matrix:
# Required env. var. by check_image_script
- PACKER_BUILDER_NAME: "fedora-29"
PACKER_BUILDER_NAME: "fedora-30"
+ #PACKER_BUILDER_NAME: "fedora-31"
PACKER_BUILDER_NAME: "xfedora-30"
PACKER_BUILDER_NAME: "ubuntu-18"
# TODO support $UBUNTU_CACHE_IMAGE_NAME: PACKER_BUILDER_NAME: "ubuntu-19"