Skip to content

Bring JH CI changes under `jh/`

This is a follow up from https://gitlab.com/gitlab-jh/gitlab/-/issues/7

It was brought up again in https://gitlab.com/gitlab-jh/gitlab/-/issues/31#note_568044066 which I forgot to create a dedicated issue for it. We need to move all JH CI changes under jh/

Namely:

diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 01505dd5170..800d50ec0bc 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -598,6 +598,11 @@ rspec-ee unit pg11:
     - .rails:rules:ee-only-unit
     - .rspec-ee-unit-parallel
 
+rspec-jh unit pg11:
+  extends:
+    - .rspec-ee-base-pg11
+    - .rails:rules:ee-only-unit
+
 rspec-ee unit pg11 minimal:
   extends:
     - rspec-ee unit pg11
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index b8527382876..a72105f0850 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -283,15 +283,15 @@
   - "Rakefile"
   - "tests.yml"
   - "config.ru"
-  - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
+  - "{,ee/,jh/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*"
   - "doc/api/graphql/reference/*"  # Files in this folder are auto-generated
   - "data/whats_new/*.yml"
   # Backstage changes
   - "Dangerfile"
   - "danger/**/*"
-  - "{,ee/}fixtures/**/*"
-  - "{,ee/}rubocop/**/*"
-  - "{,ee/}spec/**/*"
+  - "{,ee/,jh/}fixtures/**/*"
+  - "{,ee/,jh/}rubocop/**/*"
+  - "{,ee/,jh/}spec/**/*"
   - "{,spec/}tooling/**/*"
   # QA changes
   - ".dockerignore"
由 Qian Zhang (Gary) 编辑于