From 725373ab88a1ef79b87c99b3f85b57af465b11e1 Mon Sep 17 00:00:00 2001
From: Tom Heng <taoheng@jihulab.com>
Date: Fri, 3 Mar 2023 16:07:16 +0800
Subject: [PATCH] Add rules and disable jobs temporary
---
.gitlab/ci/rules.gitlab-ci.yml | 4 +--
jh/.gitlab/ci/not-run-if-jh.gitlab-ci.yml | 33 +++++++++++++++++++++++
jh/.gitlab/ci/rules.gitlab-ci.yml | 6 +++++
3 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 jh/.gitlab/ci/not-run-if-jh.gitlab-ci.yml
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 489d72b2f7e6..d8c051860f51 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -2,7 +2,7 @@
# Conditions #
##############
.if-not-canonical-namespace: &if-not-canonical-namespace
- if: '$CI_PROJECT_NAMESPACE !~ /^gitlab(-org)?($|\/)/'
+ if: '$CI_PROJECT_NAMESPACE !~ /^gitlab(-org|-cn)?($|\/)/'
.if-not-ee: &if-not-ee
# Only consider FOSS not EE
@@ -56,7 +56,7 @@
if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/'
.if-merge-request-targeting-stable-branch: &if-merge-request-targeting-stable-branch
- if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/'
+ if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/'
.if-merge-request-labels-run-in-ruby2: &if-merge-request-labels-run-in-ruby2
if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby2/'
diff --git a/jh/.gitlab/ci/not-run-if-jh.gitlab-ci.yml b/jh/.gitlab/ci/not-run-if-jh.gitlab-ci.yml
new file mode 100644
index 000000000000..6d9ca06bfd4c
--- /dev/null
+++ b/jh/.gitlab/ci/not-run-if-jh.gitlab-ci.yml
@@ -0,0 +1,33 @@
+# stage prepare
+compile-production-assets:
+ extends:
+ - .compile-assets-base
+ - .production
+ - .not-run-if-jh
+
+# stage build-images
+build-assets-image:
+ extends:
+ - .base-image-build
+ - .not-run-if-jh
+
+build-qa-image as-if-foss:
+ extends:
+ - build-qa-image
+ - .as-if-foss
+ - .not-run-if-jh
+
+# stage test
+bundle-size-review:
+ extends:
+ - .default-retry
+ - .default-utils-before_script
+ - .assets-compile-cache
+ - .not-run-if-jh
+
+# stage qa
+e2e:package-and-test-ee:
+ extends:
+ - .production
+ - .not-run-if-jh
+
diff --git a/jh/.gitlab/ci/rules.gitlab-ci.yml b/jh/.gitlab/ci/rules.gitlab-ci.yml
index 1c82dcb06479..68c5dc06bafe 100644
--- a/jh/.gitlab/ci/rules.gitlab-ci.yml
+++ b/jh/.gitlab/ci/rules.gitlab-ci.yml
@@ -64,3 +64,9 @@ include:
ARCH: amd64,arm64
- <<: *if-not-jh
when: never
+
+# disable jobs temporarily
+.not-run-if-jh:
+ rules:
+ - if: $CI_PROJECT_NAMESPACE == "gitlab-cn"
+ when: never
--
GitLab