From 55e34b981856d953a0dc0b73c1f3bda608cdbbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Tue, 29 Mar 2022 15:09:18 +0200
Subject: [PATCH] CI: Rename gitlab-ci jobs
Tim suggested to use the same name scheme for all jobs and use the group
names yocto and gitlab-ci as base.
---
.gitlab-ci.yml | 59 +++++++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 29 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d04e34f2..3f234782 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ default:
stages:
- analyze
- - deploy
+ - integrate
- check
- merge
@@ -59,27 +59,27 @@ yamllint:
# ---------------------------------------------------------------------------------------
-# Stage: deploy-test
+# Stage: integrate
# ---------------------------------------------------------------------------------------
-.foobar-manifest-projects:
+.ci-test-projects:
variables:
PROJECT_ROOT:
${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/ci-test
MANIFEST_PROJECT:
${PROJECT_ROOT}/minimal-manifest
- DEPLOY_TO:
+ INTEGRATE_INTO:
${PROJECT_ROOT}/minimal-foo
${PROJECT_ROOT}/minimal-bar
-.manifest-projects:
+.yocto-projects:
variables:
PROJECT_ROOT:
${CI_PROJECT_ROOT_NAMESPACE}
MANIFEST_PROJECT:
${PROJECT_ROOT}/yocto/manifest
- DEPLOY_TO:
+ INTEGRATE_INTO:
${PROJECT_ROOT}/3rd-party/kuk/uboot-imx-kuk
${PROJECT_ROOT}/kernel/linux-guf
${PROJECT_ROOT}/kernel/linux-imx-kuk
@@ -97,8 +97,8 @@ yamllint:
${PROJECT_ROOT}/yocto/layers/meta-guf-distro
${PROJECT_ROOT}/yocto/layers/meta-guf-machine
-.deploy:
- stage: deploy
+.integrate:
+ stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
script:
@@ -109,7 +109,7 @@ yamllint:
--manifest-project=${MANIFEST_PROJECT}
--submodule=.gitlab-ci
--revision=${CI_COMMIT_SHA}
- ${DEPLOY_TO}
+ ${INTEGRATE_INTO}
- ./generate_job_from_template.py
--template=gitlab-ci-integration.jinja2
@@ -117,44 +117,45 @@ yamllint:
--branch="integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}"
--manifest-project=${MANIFEST_PROJECT}
--parent_merge_request="${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}"
- ${DEPLOY_TO}
+ ${INTEGRATE_INTO}
> integration.yml
- cat integration.yml
artifacts:
paths:
- integration.yml
-deploy:
+integrate-yocto:
extends:
- - .deploy
- - .manifest-projects
+ - .integrate
+ - .yocto-projects
-deploy-foobar:
+integrate-ci-test:
extends:
- - .deploy
- - .foobar-manifest-projects
+ - .integrate
+ - .ci-test-projects
-trigger:
- stage: deploy
+trigger-yocto:
+ stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
- needs: [deploy]
+ needs: [integrate-yocto]
trigger:
include:
- artifact: integration.yml
- job: deploy
+ job: integrate-yocto
strategy: depend
-trigger-foobar:
- stage: deploy
+trigger-ci-test:
+ stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
- needs: [deploy-foobar]
+ needs: [integrate-ci-test]
trigger:
include:
- artifact: integration.yml
- job: deploy-foobar
+ job: integrate-ci-test
strategy: depend
+
# --------------------------------------------------------------------------------------
# Stage: merge
# --------------------------------------------------------------------------------------
@@ -170,17 +171,17 @@ trigger-foobar:
--manifest-project=${MANIFEST_PROJECT}
--submodule=.gitlab-ci
--revision=${CI_COMMIT_SHA}
- ${DEPLOY_TO}
+ ${INTEGRATE_INTO}
-merge-foobar:
+merge-ci-test:
extends:
- .merge
- - .foobar-manifest-projects
+ - .ci-test-projects
-merge:
+merge-yocto:
extends:
- .merge
- - .manifest-projects
+ - .yocto-projects
# --------------------------------------------------------------------------------------
# Stage: check
--
GitLab