From 075c9ac4551c398306b7579a8fd62f915c997b79 Mon Sep 17 00:00:00 2001
From: Nikolay Edigaryev <edigaryev@gmail.com>
Date: Fri, 17 Jun 2022 14:58:49 +0300
Subject: .cirrus.yml: fix matrix expansion by properly merging YAML mappings

Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
---
 .cirrus.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to '.cirrus.yml')

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
-- 
cgit v1.2.3-54-g00ecf