diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f846ffc1910553132441c32b4bd40779f80f931..7722bc792538abbda353eb2ca946e4bcacafadd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,6 +116,21 @@ executable: MANIFEST_PROJECT: ${PROJECT_GROUP}/manifest MANIFEST_BRANCH: ${CUSTOM_1_BRANCH} +.integrate-custom-2: + extends: .integrate + resource_group: integrate-custom-2 + variables: + PROJECT_GROUP: ${CUSTOM_2_GROUP} + MANIFEST_PROJECT: ${PROJECT_GROUP}/manifest + MANIFEST_BRANCH: ${CUSTOM_2_BRANCH} + +.integrate-custom-3: + extends: .integrate + resource_group: integrate-custom-3 + variables: + PROJECT_GROUP: ${CUSTOM_3_GROUP} + MANIFEST_PROJECT: ${PROJECT_GROUP}/manifest + MANIFEST_BRANCH: ${CUSTOM_3_BRANCH} # Jobs #integrate-ci-test:primary: @@ -143,6 +158,16 @@ integrate-yocto:custom-1: variables: MANIFEST_BRANCH: ${CUSTOM_1_BRANCH} +integrate-yocto:custom-2: + extends: .integrate-custom-2 + variables: + MANIFEST_BRANCH: ${CUSTOM_2_BRANCH} + +integrate-yocto:custom-3: + extends: .integrate-custom-3 + variables: + MANIFEST_BRANCH: ${CUSTOM_3_BRANCH} + # -------------------------------------------------------------------------------------- # Stage: build # -------------------------------------------------------------------------------------- @@ -175,6 +200,20 @@ integrate-yocto:custom-1: project: ${CUSTOM_1_GROUP}/manifest branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${CUSTOM_1_BRANCH}" strategy: depend + +.build-custom-2: + extends: .build + trigger: + project: ${CUSTOM_2_GROUP}/manifest + branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${CUSTOM_2_BRANCH}" + strategy: depend + +.build-custom-3: + extends: .build + trigger: + project: ${CUSTOM_3_GROUP}/manifest + branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${CUSTOM_3_BRANCH}" + strategy: depend # Jobs #build-ci-test:primary: @@ -207,6 +246,18 @@ build-yocto:custom-1: variables: MANIFEST_BRANCH: ${CUSTOM_1_BRANCH} +build-yocto:custom-2: + extends: .build-custom-2 + needs: ["integrate-yocto:custom-2"] + variables: + MANIFEST_BRANCH: ${CUSTOM_2_BRANCH} + +build-yocto:custom-3: + extends: .build-custom-3 + needs: ["integrate-yocto:custom-3"] + variables: + MANIFEST_BRANCH: ${CUSTOM_3_BRANCH} + # -------------------------------------------------------------------------------------- # Stage: merge # -------------------------------------------------------------------------------------- @@ -238,4 +289,18 @@ merge-custom-1: - .integrate-custom-1 - .merge variables: - MANIFEST_BRANCH: ${CUSTOM_1_BRANCH} \ No newline at end of file + MANIFEST_BRANCH: ${CUSTOM_1_BRANCH} + +merge-custom-2: + extends: + - .integrate-custom-2 + - .merge + variables: + MANIFEST_BRANCH: ${CUSTOM_2_BRANCH} + +merge-custom-3: + extends: + - .integrate-custom-3 + - .merge + variables: + MANIFEST_BRANCH: ${CUSTOM_3_BRANCH} \ No newline at end of file