mirror of https://github.com/containers/podman.git
Merge pull request #14637 from edigaryev/fix-matrix-expansion
.cirrus.yml: fix matrix expansion by properly merging YAML mappings
This commit is contained in:
commit
ff06c791ad
10
.cirrus.yml
10
.cirrus.yml
|
|
@ -616,11 +616,6 @@ remote_system_test_task:
|
||||||
|
|
||||||
|
|
||||||
rootless_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:
|
matrix:
|
||||||
# Minimal sanity testing: only the latest Fedora
|
# Minimal sanity testing: only the latest Fedora
|
||||||
- env:
|
- env:
|
||||||
|
|
@ -630,6 +625,11 @@ rootless_remote_system_test_task:
|
||||||
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
|
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
|
||||||
# ID for re-use of build output
|
# ID for re-use of build output
|
||||||
_BUILD_CACHE_HANDLE: ${FEDORA_NAME}-build-${CIRRUS_BUILD_ID}
|
_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
|
gce_instance: *standardvm
|
||||||
env:
|
env:
|
||||||
TEST_FLAVOR: sys
|
TEST_FLAVOR: sys
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue