manifest-integration-jobs.yml

@@ -61,28 +61,6 @@ build:
     branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${TARGET_BRANCH}"
     strategy: depend
 
-report-image-diff:
-  extends: .infrastructure
-  stage: manifest-integration-jobs
-  timeout: 8h
-  needs: ["build"]
-  rules:
-    # Do not run build if the "skip build" label is set on the merge request
-    - if: $CI_MERGE_REQUEST_LABELS =~ /skip build/
-      when: never
-    - if: $CI_MERGE_REQUEST_IID
-  allow_failure: true
-  script:
-    - cd ${CI_PROJECT_DIR}
-    - .gitlab-ci/scripts/report_image_diff.py
-        --gitlab-url="${CI_SERVER_URL}"
-        --token="${GITBOT_TOKEN}"
-        --manifest-project="${TARGET_PROJECT}"
-        --project="${CI_PROJECT_ID}"
-        --mr-iid="${CI_MERGE_REQUEST_IID}"
-        --target-branch="${TARGET_BRANCH}"
-        --source-branch="integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${TARGET_BRANCH}"
-
 # --------------------------------------------------------------------------------------
 # Master pipeline
 # --------------------------------------------------------------------------------------

manifest-pipeline-yocto.yml

@@ -108,3 +108,11 @@ fngsystem-pipeline:
     RELEASE_NAME_EXPRESSION: FNGSystem-${INTERIM_DR_VERSION}
     ARTIFACTS_PATH: build-*/tmp/deploy/images/**/*
     PACKAGE_TYPE: image
+
+report-image-diff:
+  extends:
+    - .report-image-diff
+  needs:
+    - job: fngsystem-pipeline
+      optional: true
+    - job: yocto-pipeline

manifest-pipeline.yml

@@ -102,6 +102,28 @@ yamllint:
     - .full_build_pipeline
   stage: manifest-pipeline
 
+.report-image-diff:
+  extends:
+    - .infrastructure
+    - .full_build_pipeline
+  stage: manifest-pipeline
+  timeout: 8h
+  rules:
+    # Do not run build if the "skip build" label is set on the merge request
+    - if: $CI_MERGE_REQUEST_LABELS =~ /skip build/
+      when: never
+    - if: $CI_MERGE_REQUEST_IID
+  allow_failure: true
+  script:
+    - cd ${CI_PROJECT_DIR}
+    - .gitlab-ci/scripts/report_image_diff.py
+        --gitlab-url="${CI_SERVER_URL}"
+        --token="${GITBOT_TOKEN}"
+        --manifest-project="${TARGET_PROJECT}"
+        --project="${CI_PROJECT_ID}"
+        --mr-iid="${CI_MERGE_REQUEST_IID}"
+        --target-branch="${TARGET_BRANCH}"
+        --source-branch="integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${TARGET_BRANCH}"
 # --------------------------------------------------------------------------------------
 # Short master pipeline (runs on master after merging a merge request)
 # --------------------------------------------------------------------------------------