diff options
author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-17 15:58:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-17 15:58:57 +0000 |
commit | ff06c791ad7fb32b6a055e0d005f7354df43a5d1 (patch) | |
tree | c2b81c1ea2d8d7e7aaed9f43fbb85972a428232b | |
parent | 3b03bd3f78b7fa1e8a692b6bbd21786e5d7e4586 (diff) | |
parent | 075c9ac4551c398306b7579a8fd62f915c997b79 (diff) | |
download | podman-ff06c791ad7fb32b6a055e0d005f7354df43a5d1.tar.gz podman-ff06c791ad7fb32b6a055e0d005f7354df43a5d1.tar.bz2 podman-ff06c791ad7fb32b6a055e0d005f7354df43a5d1.zip |
Merge pull request #14637 from edigaryev/fix-matrix-expansion
.cirrus.yml: fix matrix expansion by properly merging YAML mappings
-rw-r--r-- | .cirrus.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index fbfe58999..06f4a565c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -616,20 +616,20 @@ remote_system_test_task: rootless_remote_system_test_task: + matrix: + # Minimal sanity testing: only the latest Fedora + - env: + DISTRO_NV: ${FEDORA_NAME} + # Not used here, is used in other tasks + VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} + CTR_FQIN: ${FEDORA_CONTAINER_FQIN} + # ID for re-use of build output + _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} <<: *local_system_test_task alias: rootless_remote_system_test depends_on: - build - remote_integration_test - matrix: - # Minimal sanity testing: only the latest Fedora - - env: - DISTRO_NV: ${FEDORA_NAME} - # Not used here, is used in other tasks - VM_IMAGE_NAME: ${FEDORA_CACHE_IMAGE_NAME} - CTR_FQIN: ${FEDORA_CONTAINER_FQIN} - # ID for re-use of build output - _BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID} gce_instance: *standardvm env: TEST_FLAVOR: sys |