Commit 540a06cd authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Remerged heptapod branch into release branch

--HG--
branch : heptapod-0-21
......@@ -113,6 +113,7 @@
- "GITLAB_WORKHORSE_VERSION"
- "workhorse/**/*"
- ".gitlab/ci/workhorse.gitlab-ci.yml"
- "heptapod-ci.yml"
.yaml-lint-patterns: &yaml-lint-patterns
- ".gitlab-ci.yml"
......
<!---
Use this template for Mercurial and Evolve version bumps.
Please indicate the target versions explicitely.
The task list can also be adapted for other Python dependencies. Differences
would mostly be about the checks to perform.
--->
Task list
- [ ] bump in default branch of heptapod/ci-images/mercurial.
Subsequent checks:
+ hg-evolve version
+ versions in stable branches
+ results of downstream (py-heptapod etc) pipeline triggered by publication of the change
- [ ] main repo: bump Mercurial and hg-evolve in heptapod/heptapod, with [skip ci], as a draft in `heptapod` branch.
- [ ] rebuild heptapod/ci-images/heptapod-base (it uses head of `heptapod` branch of main repo).
Subsequent checks:
+ hg-evolve version
+ heptapod/ci-images/heptapod-gitaly rebuilt triggered by heptapod/ci-images/heptapod-base pipeline
- [ ] trigger CI on main repo: remove [skip ci] and repush on heptapod/heptapod, launch pipeline manually if needed.
Subsequent checks:
+ mercurial and evolve versions (look for hpd-versions in any of the RSpec jobs logs)
- [ ] merge in release branch of main repo, run pipeline, including manual `tarball` job
- [ ] make intermediate Omnibus release (using manual tarball and SHA256 visible in main repo `tarball` job)
- [ ] publish everything if ok up to functional tests
/label ~Foundation
\ No newline at end of file
......@@ -1375,9 +1375,9 @@ def broken?
def can_be_merged_by?(user)
access = ::Gitlab::UserAccess.new(user, container: project)
return access.hg_can_publish? if project.mercurial?
access.can_update_branch?(target_branch)
# TODO: will have to change when we have non-publishing MRs
# (e.g., targeting topics)
access.can_update_branch?(target_branch) && (!project.mercurial? || access.hg_can_publish?)
end
def can_be_merged_via_command_line_by?(user)
......
......@@ -52,7 +52,7 @@ variables:
DOCKER_VERSION: "19.03.0"
# Heptapod specific variables
# for jobs that use the CNG (Container Native) Gitaly image as a service
HEPTAPOD_CNG_GITALY_VERSION: "v13.9.4"
HEPTAPOD_CNG_GITALY_VERSION: "v13.10.0"
include:
- local: .gitlab/ci/global.gitlab-ci.yml
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment