From d6aa0b071ae2f96bcee603099c4a316ac199cc90 Mon Sep 17 00:00:00 2001
From: Fu Hanxi <fuhanxi@espressif.com>
Date: Fri, 23 Feb 2024 14:24:29 +0100
Subject: [PATCH] ci: use separate ci jobs instead of parallel matrix

---
 .gitlab-ci.yml | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29574f24158e..82256ed428bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,21 +22,23 @@ generate_version:
 
     - cat version.env
 
-build-linux:
+.build_linux_template:
   stage: build
   image: $CI_DOCKER_REGISTRY/qemu-build:6
   tags:
     - build
     - amd64
+  variables:
+    # Don't use parallel:matrix here,
+    # becuase needs:project doesn't support it
+    # https://docs.gitlab.com/ee/ci/yaml/#needsproject
+    PLATFORM: x86_64-linux-gnu
+    TARGET: ""  # to be set in the job
   artifacts:
     paths:
       - dist/qemu-*.tar.xz
       - dist/archive_name_*
     expire_in: 1 week
-  parallel:
-    matrix:
-      - PLATFORM: [x86_64-linux-gnu]
-        TARGET: [riscv32-linux-user, xtensa-softmmu, riscv32-softmmu]
   script:
     - ./.github/workflows/scripts/configure-native.sh
     - ninja -C build install
@@ -49,6 +51,24 @@ build-linux:
     - tar cJvf ${DIST_DIR}/${ARCHIVE_NAME} qemu
     - echo $ARCHIVE_NAME >${DIST_DIR}/archive_name_${TARGET}_${PLATFORM}
 
+# these build jobs names are used in needs:project in idf/qemu-tests
+# don't rename it without updating the needs:project in idf/qemu-tests
+
+build_linux_xtensa_softmmu:
+  extends: .build_linux_template
+  variables:
+    TARGET: xtensa-softmmu
+
+build_linux_riscv32_softmmu:
+  extends: .build_linux_template
+  variables:
+    TARGET: riscv32-softmmu
+
+build_linux_riscv32_user:
+  extends: .build_linux_template
+  variables:
+    TARGET: riscv32-linux-user
+
 upload_to_http:
   image: espressif/scp
   stage: deploy