Make Heptapod 0.23 the stable series
### Description Open up Heptapod 0.24 (GitLab 14.1) Bumped series: stable Shifted series: default Note: Heptapod 0.22 is already obsolete. ### Merging Most tasks The goal is to merge the shifted branch into the bumped branch. Unless explicitely stated, the branch names coincide with the series name as defined above, hence for example a simple merge/commit with the bumped series being `oldstable` (and the shifted series being `stable`) would be done with: ``` hg update oldstable hg merge stable hg commit ``` ### CI Images - [x] [heptapod-base](https://foss.heptapod.net/heptapod/ci-images/heptapod-base) not much to do, upstream's base image hasn't changed between 13.11 and 13.12 - [heptapod-gitaly](https://foss.heptapod.net/heptapod/ci-images/heptapod-gitaly) + [x] merge, commit, push + [x] pipeline ok - [x] [mercurial/hg-current](https://foss.heptapod.net/heptapod/ci-images/mercurial) nothing to be done, we didn't change the "current" Mercurial version in 0.23 ### Components that are forked from upstream GitLab For these ones, the mapping from series to branch names is: ``` default: heptapod stable: heptapod-stable oldstable: heptapod-oldstable ``` - [Heptapod Shell](https://foss.heptapod.net/heptapod/heptapod-shell) + [x] merge, commit, push + [x] pipeline ok - [Heptapod Rails]: + [x] merge, don't commit + [x] **Important** check general base image in `heptapod-ci.yml`, it should match the bumped series. Release scripts will read this to know for which series they are working. A wrong value hear gives rise to wildly inconsistent binary builds (Omnibus etc.). + [x] check cache keys in `heptapod-ci.yml`. Should be consistent with the relevant Heptapod and GitLab versions in the bumped branch + [x] commit in a topic, push, open MR + [x] pipeline ok ### Python components - [py-heptapod](https://foss.heptapod.net/heptapod/py-heptapod) + [x] merge, commit, push + [x] pipeline ok (check it's been running on the expected "current" Mercurial version for the bumped branch) - [HGitaly](https://foss.heptapod.net/heptapod/hgitaly) + [x] merge, check that the `heptapod-gitaly` image is as expected for the bumped branch in `.gitlab-ci.yml` + [x] commit, push + [x] pipeline ok ### Development, build and release tooling - [heptapod-tests](https://foss.heptapod.net/heptapod/heptapod-tests): - [x] merge and check the base image name in `.gitlab-ci.yml`: it should be the target Heptapod version, e.g, `0-21-testing`. - [x] commit, push, create a pipeline and watch it use the appropriate image. If the bumped series is `stable`, the test jobs will fail because the image doesn't exist yet. No use for a MR because of this. - [x] [HDK](https://foss.heptapod.net/heptapod/py-heptapod): update the `release-stable` or `release-oldstable` entry in `lib/gdk/config.rb` on the `heptapod` branch (we have one single branch to rule all series as of this writing but that can change in face of big future structural changes). - [Heptapod Rails]: + [x] merge the bumped branch into the release branch (e.g., 'heptapod-0-21', 'heptapod-0-22' etc). The diff should be almost empty, especially if the shifted branch was fully merged in the release branch. + [x] commit/push + [x] trigger the `tarball` job related to previous push on the release branch. + [x] in the job log, check that target Omnibus branch for automatic release is the bumped branch of Omnibus, take note of changeset node ID (part of tarball name) and SHA256 of the tarball. - [Omnibus Heptapod] (branch naming is like all forks, `heptapod`, `heptapod-stable` etc.) + [x] start a topic on the bumped branch, merge the shifted branch, commit + [ ] create a changeset with - `HEPTAPOD_VERSION`: `x.y-NODE` where `NODE` is the node ID just noted (past example `0.21-a99e86a76ee462e720bcb80c7feb080f06bb9b7d`) - `HEPTAPOD_RAILS_SHA256`: the SHA256 of the tarball + [ ] push, create a MR + [x] pipeline passes and creates the proper `x-y-testing` image + [x] downstream pipeline in heptapod-tests passes on the created image (addressed by its hash-based tag) [Heptapod Rails]: https://foss.heptapod.net/heptapod/heptapod [Omnibus Heptapod]: https://foss.heptapod.net/heptapod/omnibus-heptapod
issue