CI: Fix merge pipeline

.gitlab-ci.yml

@@ -19,8 +19,8 @@ default:
 stages:
   - analyze
   - integrate
-  - build
   - merge
+  - build
 
 workflow:
   rules:
@@ -137,8 +137,6 @@ build-yocto:
   rules:
     - if: $CI_MERGE_REQUEST_IID
       allow_failure: true
-    - if: $CI_COMMIT_BRANCH == "master"
-      when: manual
   trigger:
     project: SECO-Northern-Europe/yocto/manifest
     branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}"
@@ -150,8 +148,6 @@ build-ci-test:
   rules:
     - if: $CI_MERGE_REQUEST_IID
       allow_failure: true
-    - if: $CI_COMMIT_BRANCH == "master"
-      when: manual
   trigger:
     project: SECO-Northern-Europe/yocto/infrastructure/ci-test/minimal-manifest
     branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}"
@@ -179,3 +175,28 @@ merge-yocto:
   extends:
     - .merge
     - .yocto-projects
+
+# --------------------------------------------------------------------------------------
+# Stage: build
+# --------------------------------------------------------------------------------------
+build-master-yocto:
+  stage: build
+  needs: [merge-yocto]
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"
+      when: manual
+  trigger:
+    project: SECO-Northern-Europe/yocto/manifest
+    branch: "dunfell"
+    strategy: depend
+
+build-master-ci-test:
+  stage: build
+  needs: [merge-ci-test]
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"
+      when: manual
+  trigger:
+    project: SECO-Northern-Europe/yocto/infrastructure/ci-test/minimal-manifest
+    branch: "master"
+    strategy: depend