ci: Include as-if-jh CI files on canonical project only

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab-ci.yml

@@ -263,7 +263,20 @@ include:
   - remote: 'https://gitlab.com/gitlab-org/frontend/untamper-my-lockfile/-/raw/main/templates/merge_request_pipelines.yml'
     rules:
       - <<: *if-not-security-canonical-sync
-  - local: .gitlab/ci/gitlab-com/*.gitlab-ci.yml
+  - local: .gitlab/ci/includes/gitlab-com/*.gitlab-ci.yml
     rules:
       - if: '$CI_SERVER_HOST == "gitlab.com"'
       - if: '$CI_SERVER_HOST == "jihulab.com"'
+  - local: .gitlab/ci/includes/as-if-jh.gitlab-ci.yml
+    rules:
+      # Only run as-if-jh triggerred pipelines for gitlab.com/gitlab-org/gitlab MRs that don't target stable branches
+      # and that don't have the quarantine or pipeline:expedite labels.
+      - if: '$CI_PROJECT_URL != "https://gitlab.com/gitlab-org/gitlab"'
+        when: never
+      - if: '$CI_MERGE_REQUEST_ID == null'
+        when: never
+      - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/'
+        when: never
+      - if: '$CI_MERGE_REQUEST_LABELS =~ /quarantine/ || $CI_MERGE_REQUEST_LABELS =~ /pipeline:expedite/'
+        when: never
+      - when: always

.gitlab/ci/rules.gitlab-ci.yml

@@ -623,7 +623,7 @@
   - "vendor/assets/javascripts/**/*"
 
 .feature-flag-development-config-patterns: &feature-flag-development-config-patterns
-  - "{,ee/,jh/}config/feature_flags/{development,ops}/*.yml"
+  - "{,ee/,jh/}config/feature_flags/**/*.yml"
 
 .glfm-patterns: &glfm-patterns
   - ".gitlab/ci/rules.gitlab-ci.yml"
@@ -661,17 +661,6 @@
     - <<: *if-jh
       when: never
 
-.as-if-jh-default-exclusion-rules:
-  rules:
-    - if: '$ADD_JH_FILES_TOKEN == null'
-      when: never
-    - <<: *if-security-merge-request
-      when: never
-    - <<: *if-merge-request-targeting-stable-branch
-      when: never
-    - <<: *if-merge-request-labels-pipeline-expedite
-      when: never
-
 .rails:rules:run-search-tests:
   rules:
     - !reference [".rails:rules:default-branch-schedule-nightly--code-backstage-ee-only", rules]
@@ -3179,10 +3168,8 @@
 ##################
 .as-if-jh:rules:prepare-as-if-jh:
   rules:
-    - !reference [".strict-ee-only-rules", rules]
-    - !reference [".as-if-jh-default-exclusion-rules", rules]
     - <<: *if-merge-request-labels-as-if-jh
-    - <<: *if-dot-com-gitlab-org-merge-request
+    - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
 
 # This rule should share the same logic with .as-if-jh:rules:prepare-as-if-jh
@@ -3204,8 +3191,6 @@
 # dependencies changes.
 .as-if-jh:rules:sync-as-if-jh:
   rules:
-    - !reference [".strict-ee-only-rules", rules]
-    - !reference [".as-if-jh-default-exclusion-rules", rules]
     - <<: *if-merge-request-labels-as-if-jh
       changes: *dependency-patterns
       # Ideally, we should be able to do this:
@@ -3216,11 +3201,9 @@
 # Because the jobs using this need jobs using the preparation rules
 .as-if-jh:rules:start-as-if-jh:
   rules:
-    - !reference [".strict-ee-only-rules", rules]
-    - !reference [".as-if-jh-default-exclusion-rules", rules]
     - <<: *if-merge-request-labels-as-if-jh
       allow_failure: true  # See https://gitlab.com/gitlab-org/gitlab/-/issues/351136
-    - <<: *if-dot-com-gitlab-org-merge-request
+    - <<: *if-merge-request
       changes: *feature-flag-development-config-patterns
       allow_failure: true  # See https://gitlab.com/gitlab-org/gitlab/-/issues/351136