CI: Add all yocto projects to the job list

.gitlab-ci.yml

@@ -87,6 +87,34 @@ workflow:
     paths:
       - integration.yml
 
+deploy:
+  extends: .deploy
+  variables:
+    PROJECT_ROOT:
+      ${CI_PROJECT_ROOT_NAMESPACE}
+    MANIFEST_PROJECT:
+      ${PROJECT_ROOT}/yocto/manifest
+    DEPLOY_TO:
+      ${PROJECT_ROOT}/3rd-party/kuk/uboot-imx-kuk
+      ${PROJECT_ROOT}/kernel/linux-guf
+      ${PROJECT_ROOT}/kernel/linux-imx-kuk
+      ${PROJECT_ROOT}/kernel/modules/egalaxi2c
+      ${PROJECT_ROOT}/kernel/modules/gfplatdetect
+      ${PROJECT_ROOT}/tools/gf-emc-test-suite
+      ${PROJECT_ROOT}/tools/gf-productiontests
+      ${PROJECT_ROOT}/tools/gfeeprom
+      ${PROJECT_ROOT}/tools/gfxml2dto
+      ${PROJECT_ROOT}/tools/guf-show-demo
+      ${PROJECT_ROOT}/tools/libmdb
+      ${PROJECT_ROOT}/tools/touchcal-conv
+      ${PROJECT_ROOT}/tools/xconfig
+      ${PROJECT_ROOT}/yocto/config
+      ${PROJECT_ROOT}/yocto/infrastructure/ci-test/minimal-bar
+      ${PROJECT_ROOT}/yocto/infrastructure/ci-test/minimal-foo
+      ${PROJECT_ROOT}/yocto/infrastructure/ci-test/minimal-manifest
+      ${PROJECT_ROOT}/yocto/layers/meta-guf-distro
+      ${PROJECT_ROOT}/yocto/layers/meta-guf-machine
+
 deploy-foobar:
   extends: .deploy
   variables:
@@ -99,6 +127,15 @@ deploy-foobar:
       ${PROJECT_ROOT}/minimal-foo
       ${PROJECT_ROOT}/minimal-bar
 
+trigger:
+  stage: deploy
+  needs: [deploy]
+  trigger:
+    include:
+      - artifact: integration.yml
+        job: deploy
+    strategy: depend
+
 trigger-foobar:
   stage: deploy
   needs: [deploy-foobar]
@@ -122,57 +159,24 @@ check:
     - cd ${CI_PROJECT_DIR}
     - MERGE_REQUEST="${CI_MERGE_REQUEST_IID}";
 
-    - PROJECT_ROOT=${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/ci-test
-    - MANIFEST_PROJECT=${PROJECT_ROOT}/minimal-manifest
-    - MASTER_BRANCH=master
+    - MASTER_BRANCH=dunfell
     - ./check_if_integration_branch_is_up_to_date.py
         --gitlab-url=${CI_SERVER_URL}
         --token=${GITBOT_TOKEN}
-        --manifest-project=${MANIFEST_PROJECT}
+        --manifest-project=${CI_PROJECT_ROOT_NAMESPACE}/yocto/manifest
         --integration-base=${MASTER_BRANCH}
         --project=${CI_PROJECT_PATH}
-        --merge-request=${MERGE_REQUEST}
+        --merge-request=${CI_MERGE_REQUEST_IID}
         --verbose
-    # TODO repeat this for yocto manifest
 
-
-# ---------------------------------------------------------------------------------------
-# Stage: deploy
-# ---------------------------------------------------------------------------------------
-# .deploy: &deploy
-#   stage: deploy
-#   when: manual
-#   allow_failure: true
-#   script:
-#     - cd ${CI_PROJECT_DIR}
-#     - if [[ "$CI_COMMIT_BRANCH" == "master" ]]; then MERGE="--merge";
-#          else MERGE=""; fi
-#     - ./deploy_gitlab_ci.py
-#       --gitlab-url=${CI_SERVER_URL}
-#       --token=${GITBOT_TOKEN}
-#       --project=${CI_PROJECT_ROOT_NAMESPACE}/${CI_JOB_NAME}
-#       --submodule=.gitlab-ci
-#       --revision=${CI_COMMIT_SHA}
-#       ${MERGE}
-#
-
-# 3rd-party/kuk/uboot-imx-kuk: *deploy
-# kernel/linux-guf: *deploy
-# kernel/linux-imx-kuk: *deploy
-# kernel/modules/egalaxi2c: *deploy
-# kernel/modules/gfplatdetect: *deploy
-# tools/gf-emc-test-suite: *deploy
-# tools/gf-productiontests: *deploy
-# tools/gfeeprom: *deploy
-# tools/gfxml2dto: *deploy
-# tools/guf-show-demo: *deploy
-# tools/libmdb: *deploy
-# tools/touchcal-conv: *deploy
-# tools/xconfig: *deploy
-# yocto/config: *deploy
-# yocto/infrastructure/ci-test/minimal-bar: *deploy
-# yocto/infrastructure/ci-test/minimal-foo: *deploy
-# yocto/infrastructure/ci-test/minimal-manifest: *deploy
-# yocto/layers/meta-guf-distro: *deploy
-# yocto/layers/meta-guf-machine: *deploy
-# yocto/manifest: *deploy
+    # The check is done for both manifests in one job as the retrigger
+    # looks for jobs named check, though there can only be one
+    - ./check_if_integration_branch_is_up_to_date.py
+        --gitlab-url=${CI_SERVER_URL}
+        --token=${GITBOT_TOKEN}
+        --manifest-project
+          ${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/ci-test/minimal-manifest
+        --integration-base=master
+        --project=${CI_PROJECT_PATH}
+        --merge-request=${CI_MERGE_REQUEST_IID}
+        --verbose