diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2023-03-15 17:43:04 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2023-03-22 15:06:57 +0000 |
| commit | dbe9a9cdbb2881bd46f2ef5fd361cd75943941df (patch) | |
| tree | 841e0bc475c60d0af952aca62c2f16b67e712067 /.gitlab-ci.d/custom-runners | |
| parent | 82790dfefc98686fb268a75f76ba44a7f09f133c (diff) | |
| download | qemu-dbe9a9cdbb2881bd46f2ef5fd361cd75943941df.zip qemu-dbe9a9cdbb2881bd46f2ef5fd361cd75943941df.tar.gz qemu-dbe9a9cdbb2881bd46f2ef5fd361cd75943941df.tar.bz2 | |
gitlab: update centos-8-stream job
A couple of clean-ups here:
- inherit from the custom runners job for artefacts
- call check-avocado directly
- add some comments to the top about setup
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230315174331.2959-6-alex.bennee@linaro.org>
Diffstat (limited to '.gitlab-ci.d/custom-runners')
| -rw-r--r-- | .gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml index 068b0c4..367424d 100644 --- a/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml +++ b/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml @@ -1,4 +1,9 @@ +# All centos-stream-8 jobs should run successfully in an environment +# setup by the scripts/ci/setup/stream/8/build-environment.yml task +# "Installation of extra packages to build QEMU" + centos-stream-8-x86_64: + extends: .custom_runner_template allow_failure: true needs: [] stage: build @@ -8,15 +13,6 @@ centos-stream-8-x86_64: rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$CENTOS_STREAM_8_x86_64_RUNNER_AVAILABLE" - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: on_failure - expire_in: 7 days - paths: - - build/tests/results/latest/results.xml - - build/tests/results/latest/test-results - reports: - junit: build/tests/results/latest/results.xml before_script: - JOBS=$(expr $(nproc) + 1) script: @@ -25,6 +21,4 @@ centos-stream-8-x86_64: - ../scripts/ci/org.centos/stream/8/x86_64/configure || { cat config.log meson-logs/meson-log.txt; exit 1; } - make -j"$JOBS" - - make NINJA=":" check - || { cat meson-logs/testlog.txt; exit 1; } ; - - ../scripts/ci/org.centos/stream/8/x86_64/test-avocado + - make NINJA=":" check check-avocado |