mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: migrate the s390x custom machine to 22.04

Browse Source 
20.04 is dead (from QEMU's point of view), long live 22.04!

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240426153938.1707723-3-alex.bennee@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Alex Bennée 2024-04-26 16:39:37 +01:00 committed by Thomas Huth
parent 83561896ac
commit 108d99742a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.d/custom-runners.yml
View File

@ -29,7 +29,7 @@
junit: build/meson-logs/testlog.junit.xml junit: build/meson-logs/testlog.junit.xml
include: include:
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml'
- local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml'

28
.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml → .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
View File

@ -1,13 +1,13 @@
# All ubuntu-20.04 jobs should run successfully in an environment # All ubuntu-22.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/build-environment.yml task # setup by the scripts/ci/setup/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 20.04/20.04" # "Install basic packages to build QEMU on Ubuntu 22.04"
ubuntu-20.04-s390x-all-linux-static: ubuntu-22.04-s390x-all-linux-static:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -23,12 +23,12 @@ ubuntu-20.04-s390x-all-linux-static:
- make --output-sync check-tcg - make --output-sync check-tcg
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-20.04-s390x-all: ubuntu-22.04-s390x-all:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- s390x - s390x
timeout: 75m timeout: 75m
rules: rules:
@ -42,12 +42,12 @@ ubuntu-20.04-s390x-all:
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-20.04-s390x-alldbg: ubuntu-22.04-s390x-alldbg:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -65,12 +65,12 @@ ubuntu-20.04-s390x-alldbg:
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-20.04-s390x-clang: ubuntu-22.04-s390x-clang:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -87,11 +87,11 @@ ubuntu-20.04-s390x-clang:
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-20.04-s390x-tci: ubuntu-22.04-s390x-tci:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -107,12 +107,12 @@ ubuntu-20.04-s390x-tci:
|| { cat config.log meson-logs/meson-log.txt; exit 1; } || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
ubuntu-20.04-s390x-notcg: ubuntu-22.04-s390x-notcg:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'