Skip to content

gitlab: improvements to handling of stable staging branches

Daniel P. Berrangé qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest5 patches 2 repliesIn review
  2. v25 patches 7 repliesSuperseded
  3. v15 patches 12 repliesSuperseded

Changes in v3 from the cover letter

- Really make QEMU_CI=1 work correctly on stable staging

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5gitlab: centralize the container tag name.gitlab-ci.d/base.yml .gitlab-ci.d/buildtest-template.yml .gitlab-ci.d/buildtest.yml +4 more+22 -100 replies
2/5gitlab: allow overriding name of the upstream repository.gitlab-ci.d/base.yml docs/devel/ci-jobs.rst.inc+18 -71 reply
3/5gitlab: stable staging branches publish containers in a separate tag.gitlab-ci.d/base.yml+22 -20 replies
4/5gitlab: avoid extra pipelines for tags and stable branches.gitlab-ci.d/base.yml+8 -00 replies
5/5gitlab: support disabling job auto-run in upstream.gitlab-ci.d/base.yml+10 -01 reply

Reviews trailers per patch

All 5 patches have a Reviewed-by or Acked-by.

PatchRichard HendersonMichael TokarevThomas Huth
1/5R-b R-b
2/5R-b R-b R-b
3/5R-b R-b
4/5R-b R-b
5/5R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 0/5] gitlab: improvements to handling of stable staging branches

We just (re)discovered that our gitlab rules don't work nicely with pipelines running from stable staging branches. Every pipeline gets published with the 'latest' tag, whether its the main staging branch or one of the stable staging branches. If pipelines for multiple staging branches run concurrently they'll get very confused and end up using the wrong container content. eg a 8.0 stable job will get run with a container from the development branch, or vica-verca.

With this series we dynamically change the tag so that the 'staging' branch still uses 'latest', but the stable 'staging-X.Y' branaches use a 'staging-X-Y' container tag.

We also let the container tag be set explicitly via the new variable

QEMU_CI_CONTAINER_TAG

to facilitate CI testing, the new variable

QEMU_CI_UPSTREAM

can be set to the fork namespace, to allow contributors to run a pipeline as if their fork were upstream.

Finally 'QEMU_CI=1' is also made to work in upstream, so that it is possible to re-run selective jobs on staging branches.

Changed in v3:

- Really make QEMU_CI=1 work correctly on stable staging

Changed in v2:

- Allow QEMU_CI=1 to work on all staging branches, not just stable
- Rebased

Daniel P. Berrangé (5):
gitlab: centralize the container tag name
gitlab: allow overriding name of the upstream repository
gitlab: stable staging branches publish containers in a separate tag
gitlab: avoid extra pipelines for tags and stable branches
gitlab: support disabling job auto-run in upstream

 .gitlab-ci.d/base.yml                | 63 ++++++++++++++++++++++++----
 .gitlab-ci.d/buildtest-template.yml  |  4 +-
 .gitlab-ci.d/buildtest.yml           |  4 +-
 .gitlab-ci.d/container-template.yml  |  3 +-
 .gitlab-ci.d/crossbuild-template.yml |  6 +--
 .gitlab-ci.d/static_checks.yml       |  4 +-
 docs/devel/ci-jobs.rst.inc           | 11 +++++
 7 files changed, 78 insertions(+), 17 deletions(-)
Signature · 1 line
2.40.1