ci: Create test-docs job in mesa/mesa pipelines for MRs
authorMichel Dänzer <mdaenzer@redhat.com>
Mon, 31 Aug 2020 16:46:37 +0000 (18:46 +0200)
committerMarge Bot <eric+marge@anholt.net>
Tue, 1 Sep 2020 07:27:31 +0000 (07:27 +0000)
Since the last GitLab update, pre-merge pipelines for MRs run in the
mesa/mesa namespace, so this job didn't get created anymore, causing
trouble.

Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6522>

.gitlab-ci.yml

index 07fdd5ecc5dadb3da5dc5fe5d1ed7a1d55952b94..13a9caecd6a4dfdc2e01a1bc0e8db111a854d281 100644 (file)
@@ -70,11 +70,12 @@ test-docs:
   stage: container+docs
   rules:
     - *ignore_scheduled_pipelines
   stage: container+docs
   rules:
     - *ignore_scheduled_pipelines
-    - if: '$CI_PROJECT_NAMESPACE == "mesa"'
-      when: never
     - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
       changes: *docs-or-ci
       when: on_success
     - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
       changes: *docs-or-ci
       when: on_success
+    - if: '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"'
+      changes: *docs-or-ci
+      when: on_success
     - changes: *docs-or-ci
       when: manual
     # Other cases default to never
     - changes: *docs-or-ci
       when: manual
     # Other cases default to never