Commit b7e11a3c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'exclude-as-if-for-jh' into 'master'

We don't need to run any as-if jobs for JiHu

See merge request gitlab-org/gitlab!72376
parents 29062a70 966ceeb4
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
.if-not-foss: &if-not-foss .if-not-foss: &if-not-foss
if: '$CI_PROJECT_NAME != "gitlab-foss" && $CI_PROJECT_NAME != "gitlab-ce" && $CI_PROJECT_NAME != "gitlabhq"' if: '$CI_PROJECT_NAME != "gitlab-foss" && $CI_PROJECT_NAME != "gitlab-ce" && $CI_PROJECT_NAME != "gitlabhq"'
.if-jh: &if-jh
if: '$CI_PROJECT_PATH == "gitlab-jh/gitlab"'
.if-default-refs: &if-default-refs .if-default-refs: &if-default-refs
if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\// || $CI_MERGE_REQUEST_IID || $CI_COMMIT_TAG || $FORCE_GITLAB_CI' if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\// || $CI_MERGE_REQUEST_IID || $CI_COMMIT_TAG || $FORCE_GITLAB_CI'
...@@ -503,6 +506,8 @@ ...@@ -503,6 +506,8 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-jh
when: never
- <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-as-if-jh
- <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request-labels-run-all-rspec
- changes: *code-backstage-qa-patterns - changes: *code-backstage-qa-patterns
...@@ -517,6 +522,8 @@ ...@@ -517,6 +522,8 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-jh
when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *code-backstage-patterns changes: *code-backstage-patterns
- <<: *if-merge-request-labels-as-if-foss - <<: *if-merge-request-labels-as-if-foss
...@@ -530,6 +537,8 @@ ...@@ -530,6 +537,8 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-jh
when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *code-backstage-patterns changes: *code-backstage-patterns
- <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-as-if-jh
...@@ -579,6 +588,8 @@ ...@@ -579,6 +588,8 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-jh
when: never
# We already have `static-analysis as-if-foss` which already runs `lint:eslint:all` if the `pipeline:run-as-if-foss` label is set. # We already have `static-analysis as-if-foss` which already runs `lint:eslint:all` if the `pipeline:run-as-if-foss` label is set.
- <<: *if-merge-request-labels-as-if-foss - <<: *if-merge-request-labels-as-if-foss
when: never when: never
...@@ -648,6 +659,8 @@ ...@@ -648,6 +659,8 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-jh
when: never
- <<: *if-security-merge-request - <<: *if-security-merge-request
changes: *code-qa-patterns changes: *code-qa-patterns
- <<: *if-merge-request-labels-as-if-foss - <<: *if-merge-request-labels-as-if-foss
...@@ -1597,6 +1610,8 @@ ...@@ -1597,6 +1610,8 @@
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: never when: never
- <<: *if-jh
when: never
- <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-as-if-jh
- <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request-labels-run-all-rspec
- changes: *code-backstage-qa-patterns - changes: *code-backstage-qa-patterns
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment