From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Kevin Wolf" <kwolf@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Alexander Bulekov" <alxndr@bu.edu>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Markus Armbruster" <armbru@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Ed Maste" <emaste@freebsd.org>,
qemu-arm@nongnu.org, "Fam Zheng" <fam@euphon.net>,
"Thomas Huth" <thuth@redhat.com>,
"Yonggang Luo" <luoyonggang@gmail.com>,
qemu-block@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Bandan Das" <bsd@redhat.com>, "Li-Wen Hsu" <lwhsu@freebsd.org>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
"Laurent Vivier" <lvivier@redhat.com>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Qiuhao Li" <Qiuhao.Li@outlook.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH v3 06/24] gitlab: extend custom runners with base_job_template
Date: Tue, 28 Feb 2023 19:06:35 +0000 [thread overview]
Message-ID: <20230228190653.1602033-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org>
The base job template is responsible for controlling how we kick off
testing on our various branches. Rename and extend the
custom_runner_template so we can take advantage of all that control.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230221094558.2864616-8-alex.bennee@linaro.org>
---
.gitlab-ci.d/custom-runners.yml | 3 ++-
.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 10 +++++-----
.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml | 2 +-
.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 10 +++++-----
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 9fdc476c48..34a1e6f327 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -15,7 +15,8 @@ variables:
# All custom runners can extend this template to upload the testlog
# data as an artifact and also feed the junit report
-.custom_artifacts_template:
+.custom_runner_template:
+ extends: .base_job_template
artifacts:
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
expire_in: 7 days
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
index f512eaeaa3..cdae6c5212 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
@@ -3,7 +3,7 @@
# "Install basic packages to build QEMU on Ubuntu 20.04/20.04"
ubuntu-20.04-s390x-all-linux-static:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -24,7 +24,7 @@ ubuntu-20.04-s390x-all-linux-static:
- make --output-sync -j`nproc` check
ubuntu-20.04-s390x-all:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -43,7 +43,7 @@ ubuntu-20.04-s390x-all:
- make --output-sync -j`nproc` check
ubuntu-20.04-s390x-alldbg:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -66,7 +66,7 @@ ubuntu-20.04-s390x-alldbg:
- make --output-sync -j`nproc` check
ubuntu-20.04-s390x-clang:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -108,7 +108,7 @@ ubuntu-20.04-s390x-tci:
- make --output-sync -j`nproc`
ubuntu-20.04-s390x-notcg:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
index 42137aaf2a..50e5646a44 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
@@ -3,7 +3,7 @@
# "Install basic packages to build QEMU on Ubuntu 20.04"
ubuntu-22.04-aarch32-all:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
index 8ba85be440..13e14a0f87 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
@@ -3,7 +3,7 @@
# "Install basic packages to build QEMU on Ubuntu 20.04"
ubuntu-22.04-aarch64-all-linux-static:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -24,7 +24,7 @@ ubuntu-22.04-aarch64-all-linux-static:
- make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-all:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -46,7 +46,7 @@ ubuntu-22.04-aarch64-all:
- make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-alldbg:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -65,7 +65,7 @@ ubuntu-22.04-aarch64-alldbg:
- make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-clang:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
@@ -107,7 +107,7 @@ ubuntu-22.04-aarch64-tci:
- make --output-sync -j`nproc --ignore=40`
ubuntu-22.04-aarch64-notcg:
- extends: .custom_artifacts_template
+ extends: .custom_runner_template
needs: []
stage: build
tags:
--
2.39.2
next prev parent reply other threads:[~2023-02-28 19:09 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 19:06 [PATCH v3 00/24] testing/next: docker, avocado, unit, gitlab Alex Bennée
2023-02-28 19:06 ` [PATCH v3 01/24] tests: don't run socat tests on MacOS as well Alex Bennée
2023-02-28 19:06 ` [PATCH v3 02/24] tests: add socat dependency for tests Alex Bennée
2023-02-28 19:06 ` [PATCH v3 03/24] tests: be a bit more strict cleaning up fifos Alex Bennée
2023-02-28 19:06 ` [PATCH v3 04/24] tests: make fp-test less chatty when running from test suite Alex Bennée
2023-02-28 21:58 ` Richard Henderson
2023-02-28 19:06 ` [PATCH v3 05/24] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Alex Bennée
2023-02-28 19:06 ` Alex Bennée [this message]
2023-02-28 19:06 ` [PATCH v3 07/24] tests: don't run benchmarks for the tsan build Alex Bennée
2023-02-28 21:59 ` Richard Henderson
2023-02-28 19:06 ` [PATCH v3 08/24] testing: update ubuntu2004 to ubuntu2204 Alex Bennée
2023-02-28 19:06 ` [PATCH v3 09/24] tests: skip the nios2 replay_kernel test Alex Bennée
2023-02-28 19:06 ` [PATCH v3 10/24] tests: add tuxrun baseline test to avocado Alex Bennée
2023-02-28 19:06 ` [PATCH v3 11/24] tests/docker: Use binaries for debian-tricore-cross Alex Bennée
2023-02-28 19:06 ` [PATCH v3 12/24] tests: ensure we export job results for some cross builds Alex Bennée
2023-02-28 19:06 ` [PATCH v3 13/24] cirrus.yml: Improve the windows_msys2_task Alex Bennée
2023-02-28 19:06 ` [PATCH v3 14/24] tests/dockerfiles: unify debian-toolchain references Alex Bennée
2023-02-28 19:06 ` [PATCH v3 15/24] gitlab: Use plain docker in container-template.yml Alex Bennée
2023-02-28 19:06 ` [PATCH v3 16/24] tests: Ensure TAP version is printed before other messages Alex Bennée
2023-02-28 19:06 ` [PATCH v3 17/24] configure: expose the direct container command Alex Bennée
2023-02-28 19:06 ` [PATCH v3 18/24] tests/lcitool: append user setting stanza to dockerfiles Alex Bennée
2023-03-01 9:08 ` Daniel P. Berrangé
2023-02-28 19:06 ` [PATCH v3 19/24] tests/docker: add USER stanzas to non-lci images Alex Bennée
2023-02-28 19:06 ` [PATCH v3 20/24] tests/docker: use direct RUNC call to build containers Alex Bennée
2023-02-28 19:06 ` [PATCH v3 21/24] tests/docker: use direct RUNC call to run test jobs Alex Bennée
2023-02-28 19:06 ` [PATCH v3 22/24] gitlab: move the majority of artefact handling to a template Alex Bennée
2023-02-28 21:41 ` Philippe Mathieu-Daudé
2023-02-28 21:55 ` Alex Bennée
2023-03-01 10:44 ` Philippe Mathieu-Daudé
2023-03-01 6:51 ` Thomas Huth
2023-03-01 7:32 ` Philippe Mathieu-Daudé
2023-03-01 10:00 ` Alex Bennée
2023-03-01 10:41 ` Philippe Mathieu-Daudé
2023-03-01 11:00 ` Alex Bennée
2023-03-01 7:38 ` Philippe Mathieu-Daudé
2023-03-01 10:01 ` Alex Bennée
2023-03-01 10:43 ` Philippe Mathieu-Daudé
2023-02-28 19:06 ` [PATCH v3 23/24] tests/docker: add zstdtools to the images (!AWAITING UPSTREAM) Alex Bennée
2023-03-01 10:36 ` Philippe Mathieu-Daudé
2023-03-01 10:59 ` Alex Bennée
2023-03-01 11:06 ` Philippe Mathieu-Daudé
2023-02-28 19:06 ` [PATCH v3 24/24] tests/avocado: disable BootLinuxPPC64 test in CI Alex Bennée
2023-02-28 21:53 ` Philippe Mathieu-Daudé
2023-03-01 7:14 ` Thomas Huth
2023-03-01 9:57 ` Alex Bennée
2023-03-01 11:12 ` Philippe Mathieu-Daudé
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=20230228190653.1602033-7-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=Qiuhao.Li@outlook.com \
--cc=alxndr@bu.edu \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=bsd@redhat.com \
--cc=crosa@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=emaste@freebsd.org \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kwolf@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=lvivier@redhat.com \
--cc=lwhsu@freebsd.org \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--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).