.cirrus.yml: fix matrix expansion by properly merging YAML mappings
@@ -615,11 +615,6 @@ remote_system_test_task:
rootless_remote_system_test_task:
- <<: *local_system_test_task
- alias: rootless_remote_system_test
- depends_on:
- - build
- - remote_integration_test
matrix:
# Minimal sanity testing: only the latest Fedora
- env:
@@ -629,6 +624,11 @@ rootless_remote_system_test_task:
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
gce_instance: *standardvm
env:
TEST_FLAVOR: sys
