[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/14] gitlab: extend custom runners with base_job_template
From: |
Alex Bennée |
Subject: |
[PATCH v2 07/14] gitlab: extend custom runners with base_job_template |
Date: |
Tue, 21 Feb 2023 09:45:51 +0000 |
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>
---
.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.1
- [PATCH v2 00/14] testing/next: docker, avocado, unit, gitlab, Alex Bennée, 2023/02/21
- [PATCH v2 01/14] block: Handle curl 7.55.0, 7.85.0 version changes, Alex Bennée, 2023/02/21
- [PATCH v2 04/14] tests: be a bit more strict cleaning up fifos, Alex Bennée, 2023/02/21
- [PATCH v2 02/14] tests: don't run socat tests on MacOS as well, Alex Bennée, 2023/02/21
- [PATCH v2 05/14] tests: make fp-test less chatty when running from test suite, Alex Bennée, 2023/02/21
- [PATCH v2 07/14] gitlab: extend custom runners with base_job_template,
Alex Bennée <=
- [PATCH v2 11/14] tests: add tuxrun baseline test to avocado, Alex Bennée, 2023/02/21
- [PATCH v2 06/14] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs, Alex Bennée, 2023/02/21
- [PATCH v2 10/14] tests: skip the nios2 replay_kernel test, Alex Bennée, 2023/02/21
- [PATCH v2 03/14] tests: add socat dependency for tests, Alex Bennée, 2023/02/21
- [PATCH v2 13/14] tests: ensure we export job results for some cross builds, Alex Bennée, 2023/02/21
- [PATCH v2 08/14] tests: don't run benchmarks for the tsan build, Alex Bennée, 2023/02/21