Merge branch '351016-update-gitlab-jh-urls' into 'master'

Update gitlab-jh URLs to jihulab.com or mirror

See merge request gitlab-org/gitlab!79037

.gitlab/ci/setup.gitlab-ci.yml

@@ -159,7 +159,7 @@ add-jh-folder:
   script:
     - JH_BRANCH=$(./scripts/setup/find-jh-branch.rb)
     - 'echo "JH_BRANCH: ${JH_BRANCH}"'
-    - curl --location -o "jh-folder.tar.gz" "https://gitlab.com/gitlab-jh/gitlab/-/archive/${JH_BRANCH}/gitlab-${JH_BRANCH}.tar.gz?path=jh"
+    - curl --location -o "jh-folder.tar.gz" "https://gitlab.com/gitlab-org/gitlab-jh/gitlab/-/archive/${JH_BRANCH}/gitlab-${JH_BRANCH}.tar.gz?path=jh"
     - tar -xf "jh-folder.tar.gz"
     - mv "gitlab-${JH_BRANCH}-jh/jh/" ./
     - cp Gemfile.lock jh/

config/initializers/postgres_partitioning.rb

@@ -28,7 +28,7 @@ end
 unless Gitlab.jh?
   Gitlab::Database::Partitioning.register_tables([
     # This should be synchronized with the following model:
-    # https://gitlab.com/gitlab-jh/gitlab/-/blob/main-jh/jh/app/models/phone/verification_code.rb
+    # https://jihulab.com/gitlab-cn/gitlab/-/blob/main-jh/jh/app/models/phone/verification_code.rb
     {
       table_name: 'verification_codes',
       partitioned_column: :created_at, strategy: :monthly

doc/development/jh_features_review.md

 ---
 stage: none
 group: unassigned
-info: https://gitlab.com/gitlab-jh/gitlab
+info: https://jihulab.com/gitlab-cn/gitlab
 ---
 
 # Guidelines for reviewing JiHu (JH) Edition related merge requests
@@ -21,13 +21,13 @@ We have two kinds of changes related to JH:
   - We will generalize this so both EE and JH can share the same mechanism,
     then we wouldn't have to treat them differently.
 
-If needed, review the corresponding JH merge request located at [JH repository](https://gitlab.com/gitlab-jh/gitlab)
+If needed, review the corresponding JH merge request located at [JH repository](https://jihulab.com/gitlab-cn/gitlab)
 
 ## When to merge files to the GitLab Inc. repository
 
-Files that are added to the `gitlab-jh` repository outside of `jh/` must be mirrored in the GitLab Inc. repository.
+Files that are added to the GitLab JH repository outside of `jh/` must be mirrored in the GitLab Inc. repository.
 
-If code that is added to the GitLab Inc. repository references (for example, `render_if_exists`) any `gitlab-jh` file that does not
+If code that is added to the GitLab Inc. repository references (for example, `render_if_exists`) any GitLab JH file that does not
 exist in the GitLab Inc. codebase, add a comment with a link to the JiHu merge request or file. This is to prevent
 the reference from being misidentified as a missing partial and subsequently deleted in the `gitlab` codebase.
 
@@ -49,7 +49,7 @@ This page is the single source of truth for JiHu-related processes.
 ## CI pipelines in a JH context
 
 EE repository does not have `jh/` directory therefore there is no way to run
-JH pipelines in the EE repository. All JH tests should go to [JH repository](https://gitlab.com/gitlab-jh/gitlab).
+JH pipelines in the EE repository. All JH tests should go to [JH repository](https://jihulab.com/gitlab-cn/gitlab).
 
 The top-level JH CI configuration is located at `jh/.gitlab-ci.yml` (which
 does not exist in EE repository) and it'll include EE CI configurations
@@ -89,7 +89,7 @@ Do not use methods such as `prepend`, `extend`, and `include`. Instead, use
 the relevant EE and JH modules by the name of the receiver module.
 
 If reviewing the corresponding JH file is needed, it should be found at
-[JH repository](https://gitlab.com/gitlab-jh/gitlab).
+[JH repository](https://jihulab.com/gitlab-cn/gitlab).
 
 ### General guidance for writing JH extensions
 

doc/development/pipelines.md

@@ -194,7 +194,7 @@ If you want to force a Review App to be deployed regardless of your changes, you
 ## As-if-FOSS jobs
 
 The `* as-if-foss` jobs run the GitLab test suite "as if FOSS", meaning as if the jobs would run in the context
-of the `gitlab-org/gitlab-foss` project. These jobs are only created in the following cases:
+of `gitlab-org/gitlab-foss`. These jobs are only created in the following cases:
 
 - when the `pipeline:run-as-if-foss` label is set on the merge request
 - when the merge request is created in the `gitlab-org/security/gitlab` project
@@ -203,13 +203,12 @@ of the `gitlab-org/gitlab-foss` project. These jobs are only created in the foll
 The `* as-if-foss` jobs are run in addition to the regular EE-context jobs. They have the `FOSS_ONLY='1'` variable
 set and get the `ee/` folder removed before the tests start running.
 
-The intent is to ensure that a change doesn't introduce a failure after the `gitlab-org/gitlab` project is synced to
-the `gitlab-org/gitlab-foss` project.
+The intent is to ensure that a change doesn't introduce a failure after `gitlab-org/gitlab` is synced to `gitlab-org/gitlab-foss`.
 
 ## As-if-JH jobs
 
 The `* as-if-jh` jobs run the GitLab test suite "as if JiHu", meaning as if the jobs would run in the context
-of [the `gitlab-jh/gitlab` project](jh_features_review.md). These jobs are only created in the following cases:
+of [GitLab JH](jh_features_review.md). These jobs are only created in the following cases:
 
 - when the `pipeline:run-as-if-jh` label is set on the merge request
 - when the `pipeline:run-all-rspec` label is set on the merge request
@@ -218,16 +217,18 @@ of [the `gitlab-jh/gitlab` project](jh_features_review.md). These jobs are only
 
 The `* as-if-jh` jobs are run in addition to the regular EE-context jobs. The `jh/` folder is added before the tests start running.
 
-The intent is to ensure that a change doesn't introduce a failure after the `gitlab-org/gitlab` project is synced to
-the `gitlab-jh/gitlab` project.
+The intent is to ensure that a change doesn't introduce a failure after the `gitlab-org/gitlab` is synced to [GitLab JH](https://jihulab.com/gitlab-cn/gitlab).
 
 ### Corresponding JH branch
 
-You can create a corresponding JH branch on the `gitlab-jh/gitlab` project by
+You can create a corresponding JH branch on [GitLab JH](https://jihulab.com/gitlab-cn/gitlab) by
 appending `-jh` to the branch name. If a corresponding JH branch is found,
 `* as-if-jh` jobs grab the `jh` folder from the respective branch,
 rather than from the default branch.
 
+NOTE:
+For now, CI will try to fetch the branch on the [GitLab JH mirror](https://gitlab.com/gitlab-org/gitlab-jh/gitlab), so it might take some time for the new JH branch to propagate to the mirror.
+
 ## `undercover` RSpec test
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74859) in GitLab 14.6.

scripts/setup/find-jh-branch.rb

@@ -8,7 +8,7 @@ require_relative '../api/default_options'
 
 class FindJhBranch
   JH_DEFAULT_BRANCH = 'main-jh'
-  JH_PROJECT_PATH = 'gitlab-jh/gitlab'
+  JH_PROJECT_PATH = 'gitlab-org/gitlab-jh/gitlab'
   BranchNotFound = Class.new(RuntimeError)
 
   def run