Skip to content

Commit 4c9af1e

Browse files
committed
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 <[email protected]> Reviewed-by: Willian Rampazzo <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Acked-by: Thomas Huth <[email protected]> Message-id: [email protected]
1 parent c6f5e04 commit 4c9af1e

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

.gitlab-ci.d/custom-runners.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ variables:
1717
# setup by the scripts/ci/setup/build-environment.yml task
1818
# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
1919
ubuntu-18.04-s390x-all-linux-static:
20-
allow_failure: true
2120
needs: []
2221
stage: build
2322
tags:
@@ -37,7 +36,6 @@ ubuntu-18.04-s390x-all-linux-static:
3736
- make --output-sync -j`nproc` check-tcg V=1
3837

3938
ubuntu-18.04-s390x-all:
40-
allow_failure: true
4139
needs: []
4240
stage: build
4341
tags:
@@ -54,15 +52,16 @@ ubuntu-18.04-s390x-all:
5452
- make --output-sync -j`nproc` check V=1
5553

5654
ubuntu-18.04-s390x-alldbg:
57-
allow_failure: true
5855
needs: []
5956
stage: build
6057
tags:
6158
- ubuntu_18.04
6259
- s390x
6360
rules:
6461
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
62+
when: manual
6563
- if: "$S390X_RUNNER_AVAILABLE"
64+
when: manual
6665
script:
6766
- mkdir build
6867
- cd build
@@ -72,7 +71,6 @@ ubuntu-18.04-s390x-alldbg:
7271
- make --output-sync -j`nproc` check V=1
7372

7473
ubuntu-18.04-s390x-clang:
75-
allow_failure: true
7674
needs: []
7775
stage: build
7876
tags:
@@ -91,23 +89,23 @@ ubuntu-18.04-s390x-clang:
9189
- make --output-sync -j`nproc` check V=1
9290

9391
ubuntu-18.04-s390x-tci:
94-
allow_failure: true
9592
needs: []
9693
stage: build
9794
tags:
9895
- ubuntu_18.04
9996
- s390x
10097
rules:
10198
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
99+
when: manual
102100
- if: "$S390X_RUNNER_AVAILABLE"
101+
when: manual
103102
script:
104103
- mkdir build
105104
- cd build
106105
- ../configure --disable-libssh --enable-tcg-interpreter
107106
- make --output-sync -j`nproc`
108107

109108
ubuntu-18.04-s390x-notcg:
110-
allow_failure: true
111109
needs: []
112110
stage: build
113111
tags:
@@ -129,7 +127,6 @@ ubuntu-18.04-s390x-notcg:
129127
# setup by the scripts/ci/setup/qemu/build-environment.yml task
130128
# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
131129
ubuntu-20.04-aarch64-all-linux-static:
132-
allow_failure: true
133130
needs: []
134131
stage: build
135132
tags:
@@ -149,15 +146,16 @@ ubuntu-20.04-aarch64-all-linux-static:
149146
- make --output-sync -j`nproc` check-tcg V=1
150147

151148
ubuntu-20.04-aarch64-all:
152-
allow_failure: true
153149
needs: []
154150
stage: build
155151
tags:
156152
- ubuntu_20.04
157153
- aarch64
158154
rules:
159155
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
156+
when: manual
160157
- if: "$AARCH64_RUNNER_AVAILABLE"
158+
when: manual
161159
script:
162160
- mkdir build
163161
- cd build
@@ -166,7 +164,6 @@ ubuntu-20.04-aarch64-all:
166164
- make --output-sync -j`nproc` check V=1
167165

168166
ubuntu-20.04-aarch64-alldbg:
169-
allow_failure: true
170167
needs: []
171168
stage: build
172169
tags:
@@ -184,7 +181,6 @@ ubuntu-20.04-aarch64-alldbg:
184181
- make --output-sync -j`nproc` check V=1
185182

186183
ubuntu-20.04-aarch64-clang:
187-
allow_failure: true
188184
needs: []
189185
stage: build
190186
tags:
@@ -203,23 +199,23 @@ ubuntu-20.04-aarch64-clang:
203199
- make --output-sync -j`nproc` check V=1
204200

205201
ubuntu-20.04-aarch64-tci:
206-
allow_failure: true
207202
needs: []
208203
stage: build
209204
tags:
210205
- ubuntu_20.04
211206
- aarch64
212207
rules:
213208
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
209+
when: manual
214210
- if: "$AARCH64_RUNNER_AVAILABLE"
211+
when: manual
215212
script:
216213
- mkdir build
217214
- cd build
218215
- ../configure --disable-libssh --enable-tcg-interpreter
219216
- make --output-sync -j`nproc`
220217

221218
ubuntu-20.04-aarch64-notcg:
222-
allow_failure: true
223219
needs: []
224220
stage: build
225221
tags:

0 commit comments

Comments
 (0)