Release 15.5

After the EE stable branch 15-5-stable-ee is created

• Update main-jh with the latest master again.

  • git checkout main-jh
  • git pull
  • git fetch upstream
  • git checkout upstream/master
  • git pull upstream master
  • git checkout main-jh
  • 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 15-5-stable-ee was cut from master.

  $ git show `git merge-base upstream/15-5-stable-ee upstream/master`
    commit 365bc577b7946e51b2fed5803c14de3ee3f54a08
    Merge: 8fc45a11fdc4 8acf9cd19f2e
    Author: Andrejs Cunskis <acunskis@gitlab.com>
    Date:   Wed Oct 19 22:12:37 2022
  
        Merge branch 'sv-quarantine-maven-test' into 'master'
  
        Quarantine maven request forward test
  
        See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101514
  
        Merged-by: Andrejs Cunskis <acunskis@gitlab.com>
        Approved-by: Andrejs Cunskis <acunskis@gitlab.com>
        Co-authored-by: Sofia Vistas <svistas@gitlab.com>

• Get the latest JH merge commit or Update jh/Gemfile.lock commit until the commit 365bc577b7946e51b2fed5803c14de3ee3f54a08.

  $ git log --show-pulls --until "Wed Oct 19 22:12:37 2022" main-jh -- jh
    commit 63e1a3bad7584a278fffa449c66d9df230daacb4
    Author: JH_SYNC_TOKEN <project23966655_bot2@example.com>
    Date:   Wed Oct 19 12:04:04 2022
  
      Update jh/Gemfile.lock
  
  

• Create 15-5-stable-jh from the commit 63e1a3bad7584a278fffa449c66d9df230daacb4.

  • git branch 15-5-stable-jh 63e1a3bad7584a278fffa449c66d9df230daacb4

• Merge 15-5-stable-ee to 15-5-stable-jh.

  • git checkout 15-5-stable-jh
  • git merge upstream/15-5-stable-ee

• Review JH changes between 15-5-stable-ee and 15-5-stable-jh.

  • git diff upstream/15-5-stable-ee..15-5-stable-jh > jh-stable.patch
  • diff jh-stable.patch jh.patch # => This should only contain the code diff of the JH commits merged after 63e1a3bad7584a278fffa449c66d9df230daacb4 on main-jh, i.e. the following commits and their code diff:

    $ git rev-list --no-merges 63e1a3bad7584a278fffa449c66d9df230daacb4..main-jh -- jh
    d5ca18eb61fb1b4afff226480c1822183a5aba18
    b0cdf73c965d8b34e65582f50eb657c6bc1dc633
    5f95b90bcf96bbdcd63b4d4ce623948f6eacd39a
    f69f6ae9d5d7b31dd696108c411c2efcd372e9de
    682aa4765decfc32c261a84477c976e11d1b02bc
    a83c5e8b6068d691c78468d2cf9f1fc2990897f1
    332fe21c9610ed4b100c032f8dfee48c145e2517
    a0c66941ebaec109b1f2ed556fd69ef3cad94942
    73ae35ce92bb358588be060b3dc1c1d46000ab0d
    04f20e02b40b92cdf8a4cfca6725e527fa9efaf8
    3b401bb10f2956b31b16d1e3724dae0eff47d1ec
    68eab0780ea7c796b78aea006c73f9896762127a
    b8110b852dc75509c10a57d116e03a99f42b2490
    7b2505e5f3a9d6776858feaa510be691495f7788
    ecda412fab1a43645f42d698d3b31c71f0d16f31
    139d114e3737ff57f51d67febc3c0c1b776662f2
    0bdc299fafdaa89011dbf582712e3ebf4d515298
    6da4f3cf34c5e29e3e5f29ee063dea8622e356a1
    695c51aa7b50c7671f4f6a9b3e94548c9cfdc34a
    eb0835a579c89227bee3cc0cc8d9316f14e58194
    
    $ git diff 63e1a3bad7584a278fffa449c66d9df230daacb4..main-jh -- jh

• Cherry pick the following JH commits to 15-5-stable-jh since we need them in this release. Please note they are the merge commits in the related MRs, so we need to cherry pick them with the -m1 option, and these commits should be cherry picked in the same order as when the related MRs were merged (otherwise there may be code conflicts during cherry-pick). If any of these commits depends on an upstream commit which is not in 15-5-stable-ee, we need to cherry pick such upstream commit first.

  • git cherry-pick -m1 ef416c5e26c7c1a4097428ab1101d89e6631f94b, related MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101824

• Update the jh/Gemfile.lock file:

  • bundle config set --local gemfile jh/Gemfile (if you didn't point Gemfile to jh/Gemfile before)
  • cp Gemfile.lock jh/ && bundle install
  • If the above step generates changes to the jh/Gemfile.lock file, commit the changes with the commit message Update jh/Gemfile.lock.

• Push 15-5-stable-jh to remote.

  • git push --set-upstream origin 15-5-stable-jh
  • 15-5-stable-jh can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/15-5-stable-jh.

• Monitor the pipeline of 15-5-stable-jh and make sure it can pass.

After the EE release tag v15.5.0-ee is created

• Merge the EE release tag to make sure we have all the commits.
  • git checkout 15-5-stable-jh
  • git merge v15.5.0-ee
• Update VERSION to 15.5.0-jh.
  • echo -n 15.5.0-jh > VERSION
  • git commit -a -m "Update VERSION to 15.5.0-jh"
• Tag v15.5.0-jh from 15-5-stable-jh.
  • git tag v15.5.0-jh -m "Version v15.5.0-jh"
• Push the branch 15-5-stable-jh and the tag v15.5.0-jh
  • git checkout 15-5-stable-jh
  • git push
  • git push origin v15.5.0-jh
  • v15.5.0-jh can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v15.5.0-jh
• Monitor the pipeline of v15.5.0-jh and make sure it can pass.

added release label

assigned to @daveliu

marked the checklist item Merge the EE release tag to make sure we have all the commits. as incomplete

marked the checklist item Update VERSION to 15.5.0-jh. as incomplete

marked the checklist item Tag v15.5.0-jh from 15-5-stable-jh. as incomplete

marked the checklist item Push the branch 15-5-stable-jh and the tag v15.5.0-jh as incomplete

marked the checklist item Monitor the pipeline of v15.5.0-jh and make sure it can pass. as incomplete

marked the checklist item Monitor the pipeline of 15-5-stable-jh and make sure it can pass. as incomplete

changed the description

marked the checklist item Merge the EE release tag to make sure we have all the commits. as completed

marked the checklist item Update VERSION to 15.5.0-jh. as completed

marked the checklist item Push the branch 15-5-stable-jh and the tag v15.5.0-jh as completed

marked the checklist item Monitor the pipeline of v15.5.0-jh and make sure it can pass. as completed

closed

added 1 deleted label