Release 14.0 for JH

After the EE stable branch 14-0-stable-ee is created

• Update main-jh with the latest master again.
  • git checkout main-jh
  • git pull
  • git fetch upstream
  • git merge upstream/master
  • git push
• Review JH changes between master and main-jh.
  • git diff upstream/master..main-jh > jh.patch
• Get the commit where 14-0-stable-ee was cut from master.

  $ git show `git merge-base upstream/14-0-stable-ee upstream/master`
  commit e0decc6b74381680262a2a82df0210060b0fa084
  Merge: d08dbd1fc58 1b29140c696
  Author: Andrew Fontaine <afontaine@gitlab.com>
  Date:   Thu Jun 17 08:30:26 2021
  
    Merge branch '330939-remove-canary_ingress_weight_control-ff' into 'master'
    
    Remove canary_ingress_weight_control feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]
    
    See merge request gitlab-org/gitlab!63710

• Get the latest JH merge commit until the commit e0decc6b74381680262a2a82df0210060b0fa084.

  $ git log --show-pulls --until "Thu Jun 17 08:30:26 2021" main-jh -- jh
  ...
  commit b6e2f6f8aa070b91a115137de8d616fd7b514ff6
  Author: Qian Zhang <zhq527725@gmail.com>
  Date:   Wed Jun 16 16:52:37 2021
  
      Merge branch '51-override-com-url-related-methods-in-jh-gitlab-saas' into 'main-jh'
    
      Override com url related methods in jh/gitlab/saas.rb
    
      See merge request gitlab-jh/gitlab!28
  ...

• Create 14-0-stable-jh from the commit b6e2f6f8aa070b91a115137de8d616fd7b514ff6.
  • git branch 14-0-stable-jh b6e2f6f8aa070b91a115137de8d616fd7b514ff6
• Merge 14-0-stable-ee to 14-0-stable-jh.
  • git checkout 14-0-stable-jh
  • git merge upstream/14-0-stable-ee
• Review JH changes between 14-0-stable-ee and 14-0-stable-jh.
  • git diff upstream/14-0-stable-ee..14-0-stable-jh > jh-stable.patch
  • diff jh.patch jh-stable.patch # => This should contain the code diff of the commits merged after e0decc6b74381680262a2a82df0210060b0fa084, i.e. https://gitlab.com/gitlab-jh/gitlab/-/commit/1048914154162bf6459ef1509c7f8d6081fa3a78. diff result:

    3c3
    < index 00000000000..bc0ea0e3cfe
    ---
    > index 00000000000..beeef9880f0
    6c6
    < @@ -0,0 +1,29 @@
    ---
    > @@ -0,0 +1,30 @@
    9c9,10
    < +  - local: jh/.gitlab/ci/*.gitlab-ci.yml
    ---
    > +  - local: jh/.gitlab/ci/rails.gitlab-ci.yml
    > +  - local: jh/.gitlab/ci/sync.gitlab-ci.yml
    36,52d36
    < diff --git a/jh/.gitlab/ci/only-jh.gitlab-ci.yml b/jh/.gitlab/ci/only-jh.gitlab-ci.yml
    < new file mode 100644
    < index 00000000000..33207ca2811
    < --- /dev/null
    < +++ b/jh/.gitlab/ci/only-jh.gitlab-ci.yml
    < @@ -0,0 +1,11 @@
    < +only-jh-check:
    < +  stage: test
    < +  extends:
    < +    - .minimal-job
    < +  rules:
    < +    - if: $CI_MERGE_REQUEST_IID
    < +  script:
    < +    - git fetch origin ${CI_DEFAULT_BRANCH}
    < +    - git diff --name-only origin/${CI_DEFAULT_BRANCH}... -- jh > jh-changes
    < +    - git diff --name-only origin/${CI_DEFAULT_BRANCH}... > all-changes
    < +    - diff jh-changes all-changes

• Push 14-0-stable-jh to remote.
  • git push --set-upstream origin 14-0-stable-jh
• 14-0-stable-jh can now be found at https://gitlab.com/gitlab-jh/gitlab/-/commits/14-0-stable-jh.

After the EE release tag v14.0.0-ee is created

• Merge the EE release tag to make sure we have all the commits.
  • git checkout 14-0-stable-jh
  • git merge v14.0.0-ee
• Update VERSION to 14.0.0-jh.
  • echo -n 14.0.0-jh > VERSION
  • git commit -a -m "Update VERSION to 14.0.0-jh"
• Tag v14.0.0-jh from 14-0-stable-jh.
  • git tag v14.0.0-jh -m "Version v14.0.0-jh"
• Push the branch 14-0-stable-jh and the tag v14.0.0-jh
  • git checkout 14-0-stable-jh
  • git push
  • git push origin v14.0.0-jh
• v14.0.0-jh can now be found at https://gitlab.com/gitlab-jh/gitlab/-/commits/v14.0.0-jh