From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 0/5] gitlab: improvements to handling of stable staging branches
Date: Wed, 17 May 2023 14:54:43 +0100 [thread overview]
Message-ID: <20230517135448.262483-1-berrange@redhat.com> (raw)
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.
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(-)
--
2.40.1
next reply other threads:[~2023-05-17 13:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 13:54 Daniel P. Berrangé [this message]
2023-05-17 13:54 ` [PATCH 1/5] gitlab: centralize the container tag name Daniel P. Berrangé
2023-05-17 15:17 ` Michael Tokarev
2023-05-17 20:01 ` Richard Henderson
2023-05-26 7:25 ` Thomas Huth
2023-05-26 10:20 ` Daniel P. Berrangé
2023-05-26 10:31 ` Thomas Huth
2023-05-26 10:33 ` Daniel P. Berrangé
2023-05-17 13:54 ` [PATCH 2/5] gitlab: allow overriding name of the upstream repository Daniel P. Berrangé
2023-05-17 15:18 ` Michael Tokarev
2023-05-17 13:54 ` [PATCH 3/5] gitlab: stable staging branches publish containers in a separate tag Daniel P. Berrangé
2023-05-17 15:26 ` Michael Tokarev
2023-05-17 15:37 ` Daniel P. Berrangé
2023-05-17 13:54 ` [PATCH 4/5] gitlab: avoid extra pipelines for tags and stable branches Daniel P. Berrangé
2023-05-17 15:27 ` Michael Tokarev
2023-05-17 13:54 ` [PATCH 5/5] gitlab: support disabling job auto-run in upstream Daniel P. Berrangé
2023-05-17 15:13 ` Michael Tokarev
2023-05-17 15:38 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230517135448.262483-1-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).