aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.d
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-09-13 11:19:48 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-09-14 17:03:03 +0100
commit4c9af1ea1457782cf0adb293179335ef6de942aa (patch)
tree3ac4ce7b3038bd6f4071e16b19c7a58a70aeb25a /.gitlab-ci.d
parentc6f5e042d89e79206cd1ce5525d3df219f13c3cc (diff)
downloadqemu-4c9af1ea1457782cf0adb293179335ef6de942aa.zip
qemu-4c9af1ea1457782cf0adb293179335ef6de942aa.tar.gz
qemu-4c9af1ea1457782cf0adb293179335ef6de942aa.tar.bz2
gitlab-ci: Make more custom runner jobs manual, and don't allow failure
Currently we define a lot of jobs for our custom runners: for both aarch64 and s390x we have - all-linux-static - all - alldbg - clang (manual) - tci - notcg (manual) This is overkill. The main reason to run on these hosts is to get coverage for the host architecture; we can leave the handling of differences like debug vs non-debug to the x86 CI jobs. The jobs are also generally running OK; they occasionally fail due to timeouts, which is likely because we're overloading the machine by asking it to run 4 CI jobs at once plus the ad-hoc CI. Remove the 'allow_failure' tag from all these jobs, and switch the s390x-alldbg, aarch64-all, s390x-tci and aarch64-tci jobs to manual. (We keep -all on s390x and -alldbg on aarch64 just for diversity of coverage.) This will let us make the switch for s390x and aarch64 hosts from the ad-hoc CI to gitlab. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Acked-by: Thomas Huth <thuth@redhat.com> Message-id: 20210913101948.12600-1-peter.maydell@linaro.org
Diffstat (limited to '.gitlab-ci.d')
-rw-r--r--.gitlab-ci.d/custom-runners.yml20
1 files changed, 8 insertions, 12 deletions
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 0d3e4a7..bcd22ca 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -17,7 +17,6 @@ variables:
# setup by the scripts/ci/setup/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
ubuntu-18.04-s390x-all-linux-static:
- allow_failure: true
needs: []
stage: build
tags:
@@ -37,7 +36,6 @@ ubuntu-18.04-s390x-all-linux-static:
- make --output-sync -j`nproc` check-tcg V=1
ubuntu-18.04-s390x-all:
- allow_failure: true
needs: []
stage: build
tags:
@@ -54,7 +52,6 @@ ubuntu-18.04-s390x-all:
- make --output-sync -j`nproc` check V=1
ubuntu-18.04-s390x-alldbg:
- allow_failure: true
needs: []
stage: build
tags:
@@ -62,7 +59,9 @@ ubuntu-18.04-s390x-alldbg:
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
- if: "$S390X_RUNNER_AVAILABLE"
+ when: manual
script:
- mkdir build
- cd build
@@ -72,7 +71,6 @@ ubuntu-18.04-s390x-alldbg:
- make --output-sync -j`nproc` check V=1
ubuntu-18.04-s390x-clang:
- allow_failure: true
needs: []
stage: build
tags:
@@ -91,7 +89,6 @@ ubuntu-18.04-s390x-clang:
- make --output-sync -j`nproc` check V=1
ubuntu-18.04-s390x-tci:
- allow_failure: true
needs: []
stage: build
tags:
@@ -99,7 +96,9 @@ ubuntu-18.04-s390x-tci:
- s390x
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
- if: "$S390X_RUNNER_AVAILABLE"
+ when: manual
script:
- mkdir build
- cd build
@@ -107,7 +106,6 @@ ubuntu-18.04-s390x-tci:
- make --output-sync -j`nproc`
ubuntu-18.04-s390x-notcg:
- allow_failure: true
needs: []
stage: build
tags:
@@ -129,7 +127,6 @@ ubuntu-18.04-s390x-notcg:
# setup by the scripts/ci/setup/qemu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
ubuntu-20.04-aarch64-all-linux-static:
- allow_failure: true
needs: []
stage: build
tags:
@@ -149,7 +146,6 @@ ubuntu-20.04-aarch64-all-linux-static:
- make --output-sync -j`nproc` check-tcg V=1
ubuntu-20.04-aarch64-all:
- allow_failure: true
needs: []
stage: build
tags:
@@ -157,7 +153,9 @@ ubuntu-20.04-aarch64-all:
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
- if: "$AARCH64_RUNNER_AVAILABLE"
+ when: manual
script:
- mkdir build
- cd build
@@ -166,7 +164,6 @@ ubuntu-20.04-aarch64-all:
- make --output-sync -j`nproc` check V=1
ubuntu-20.04-aarch64-alldbg:
- allow_failure: true
needs: []
stage: build
tags:
@@ -184,7 +181,6 @@ ubuntu-20.04-aarch64-alldbg:
- make --output-sync -j`nproc` check V=1
ubuntu-20.04-aarch64-clang:
- allow_failure: true
needs: []
stage: build
tags:
@@ -203,7 +199,6 @@ ubuntu-20.04-aarch64-clang:
- make --output-sync -j`nproc` check V=1
ubuntu-20.04-aarch64-tci:
- allow_failure: true
needs: []
stage: build
tags:
@@ -211,7 +206,9 @@ ubuntu-20.04-aarch64-tci:
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
+ when: manual
- if: "$AARCH64_RUNNER_AVAILABLE"
+ when: manual
script:
- mkdir build
- cd build
@@ -219,7 +216,6 @@ ubuntu-20.04-aarch64-tci:
- make --output-sync -j`nproc`
ubuntu-20.04-aarch64-notcg:
- allow_failure: true
needs: []
stage: build
tags: