summaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-07-30 08:46:13 -0400
committerChris Evich <cevich@redhat.com>2019-08-12 12:01:55 -0400
commit5f99703594414039b9e7e1b615687d009f21d7c4 (patch)
tree983000fb303d8cb7f8bce936bd5be1b569e95463 /.cirrus.yml
parent7508179ed973a1ad0d26754d39180be8066c7df4 (diff)
downloadpodman-5f99703594414039b9e7e1b615687d009f21d7c4.tar.gz
podman-5f99703594414039b9e7e1b615687d009f21d7c4.tar.bz2
podman-5f99703594414039b9e7e1b615687d009f21d7c4.zip
Cirrus: Add verification for cgroupv2 image
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml20
1 files changed, 13 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 86c4232f5..79c411a09 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -364,7 +364,6 @@ special_testing_rootless_task:
env:
ADD_SECOND_PARTITION: true
SPECIALMODE: 'rootless' # See docs
-
matrix:
TEST_REMOTE_CLIENT: true
TEST_REMOTE_CLIENT: false
@@ -446,6 +445,9 @@ special_testing_cgroupv2_task:
env:
SPECIALMODE: 'cgroupv2' # See docs
+ matrix:
+ TEST_REMOTE_CLIENT: true
+ TEST_REMOTE_CLIENT: false
timeout_in: 20m
@@ -508,18 +510,20 @@ verify_test_built_images_task:
- "test_build_cache_images"
gce_instance:
- matrix:
- # Images are generated separately, from build_images_task (below)
- image_name: "fedora-29${BUILT_IMAGE_SUFFIX}"
- image_name: "fedora-30${BUILT_IMAGE_SUFFIX}"
- image_name: "xfedora-30${BUILT_IMAGE_SUFFIX}"
- image_name: "ubuntu-18${BUILT_IMAGE_SUFFIX}"
+ # Images generated by test_build_cache_images_task (above)
+ image_name: "${PACKER_BUILDER_NAME}${BUILT_IMAGE_SUFFIX}"
env:
ADD_SECOND_PARTITION: true
matrix:
TEST_REMOTE_CLIENT: true
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: "xfedora-30"
+ PACKER_BUILDER_NAME: "ubuntu-18"
environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
# Verify expectations once per image
@@ -558,6 +562,7 @@ success_task:
- "testing"
- "special_testing_rootless"
- "special_testing_in_podman"
+ - "special_testing_cgroupv2"
- "special_testing_cross"
- "test_build_cache_images"
- "verify_test_built_images"
@@ -596,6 +601,7 @@ release_task:
- "testing"
- "special_testing_rootless"
- "special_testing_in_podman"
+ - "special_testing_cgroupv2"
- "special_testing_cross"
- "test_build_cache_images"
- "verify_test_built_images"