summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolay Edigaryev <edigaryev@gmail.com>2022-06-17 14:58:49 +0300
committerNikolay Edigaryev <edigaryev@gmail.com>2022-06-17 15:02:01 +0300
commit075c9ac4551c398306b7579a8fd62f915c997b79 (patch)
tree35b0284d3e7f48b823265a6a8607a59611939931
parentc936d1e61154b6826e9d8df46e9660aba6c86cfe (diff)
downloadpodman-075c9ac4551c398306b7579a8fd62f915c997b79.tar.gz
podman-075c9ac4551c398306b7579a8fd62f915c997b79.tar.bz2
podman-075c9ac4551c398306b7579a8fd62f915c997b79.zip
.cirrus.yml: fix matrix expansion by properly merging YAML mappings
Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
-rw-r--r--.cirrus.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index d5298d62e..03a3638fb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -615,20 +615,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