From 1e330dfb6b53259c321eef65f08c8cdadeafa091 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Thu, 15 Dec 2022 12:28:41 +0100
Subject: [PATCH] Insert PROJECT_INTEGRATION_GROUPS variable
* The .gitlab-ci submodule is added also to other groups (those
containing kernel, uboot, etc.) so it is necessary to create an
integration branch also them
---
.gitlab-ci.yml | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fcdf03..45cded4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
CI_IMAGES_REV: latest
CI_IMAGE_PYTHON: "${CI_IMAGES_PATH}/infrastructure/python3.9:${CI_IMAGES_REV}"
CI_IMAGE_YOCTO: "secodocker/edgehog-builder:${CI_IMAGES_REV}"
+ PROJECT_INTEGRATION_GROUPS: "arm/nxp/imx/develop/yocto/5.x arm/rockchip"
image: "${CI_IMAGE_PYTHON}"
@@ -75,14 +76,26 @@ executable:
MERGE: ""
script:
- cd ${CI_PROJECT_DIR}
- - echo
- - echo ${CI_SERVER_URL}
- echo ${GITBOT_TOKEN}
- echo ${MANIFEST_PROJECT}
- echo ${MANIFEST_BRANCH}
- echo ${CI_COMMIT_SHA}
- echo ${PROJECT_GROUP}
- echo ${MERGE}
+ -|
+ for PROJECT_INTEGRATION in ${PROJECT_INTEGRATION_GROUPS}; do
+ echo ${PROJECT_INTEGRATION}
+ scripts/deploy_gitlab_ci_projects.py
+ --gitlab-url=${CI_SERVER_URL}
+ --token=${GITBOT_TOKEN}
+ --manifest-project=${MANIFEST_PROJECT}
+ --manifest-branch=${MANIFEST_BRANCH}
+ --submodule=.gitlab-ci
+ --revision=${CI_COMMIT_SHA}
+ --group=${PROJECT_INTEGRATION}
+ --verbose
+ ${MERGE}
+ done
- scripts/deploy_gitlab_ci.py
--gitlab-url=${CI_SERVER_URL}
--token=${GITBOT_TOKEN}
@@ -116,7 +129,7 @@ executable:
# extends: .integrate-ci-test
# variables:
# MANIFEST_BRANCH: primary
-#
+
#integrate-ci-test:secondary:
# extends: .integrate-ci-test
# variables:
@@ -166,7 +179,7 @@ integrate-yocto:kirkstone:
# needs: ["integrate-ci-test:primary"]
# variables:
# MANIFEST_BRANCH: primary
-#
+
#build-ci-test:secondary:
# extends: .build-ci-test
# needs: ["integrate-ci-test:secondary"]
--
GitLab