Skip to content

Commit

Permalink
gitlab-ci: Make more custom runner jobs manual, and don't allow failure
Browse files Browse the repository at this point in the history
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.
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>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-id: 20210913101948.12600-1-peter.maydell@linaro.org
  • Loading branch information
pm215 committed Sep 14, 2021
1 parent c6f5e04 commit 5f3a683
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions .gitlab-ci.d/custom-runners.yml
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -54,15 +52,16 @@ 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:
- ubuntu_18.04
- 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
Expand All @@ -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:
Expand All @@ -91,23 +89,23 @@ 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:
- ubuntu_18.04
- 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
- ../configure --disable-libssh --enable-tcg-interpreter
- make --output-sync -j`nproc`

ubuntu-18.04-s390x-notcg:
allow_failure: true
needs: []
stage: build
tags:
Expand All @@ -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:
Expand All @@ -149,15 +146,16 @@ 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:
- ubuntu_20.04
- 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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -203,23 +199,23 @@ 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:
- ubuntu_20.04
- 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
- ../configure --disable-libssh --enable-tcg-interpreter
- make --output-sync -j`nproc`

ubuntu-20.04-aarch64-notcg:
allow_failure: true
needs: []
stage: build
tags:
Expand Down

0 comments on commit 5f3a683

Please sign in to comment.