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

gitlab-ci: update aarch32/aarch64 custom runner jobs

Browse Source 
The custom runner is now using 22.04 so we can drop our hacks to deal
with broken libssh and glusterfs. The provisioning scripts will be
updated in a separate commit.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-21-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2022-09-14 16:59:40 +01:00
parent 45e1b74694
commit 66dca26748
4 changed files with 24 additions and 25 deletions

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

@ -15,6 +15,6 @@ variables:
include: include:
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-20.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'

6
.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml → .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml

@ -1,12 +1,12 @@
# 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/qemu/build-environment.yml task # setup by the scripts/ci/setup/qemu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 20.04" # "Install basic packages to build QEMU on Ubuntu 20.04"
ubuntu-20.04-aarch32-all: ubuntu-22.04-aarch32-all:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch32 - aarch32
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'

36
.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml → .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml

@ -2,23 +2,21 @@
# setup by the scripts/ci/setup/qemu/build-environment.yml task # setup by the scripts/ci/setup/qemu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 20.04" # "Install basic packages to build QEMU on Ubuntu 20.04"
ubuntu-20.04-aarch64-all-linux-static: ubuntu-22.04-aarch64-all-linux-static:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
- if: "$AARCH64_RUNNER_AVAILABLE" - if: "$AARCH64_RUNNER_AVAILABLE"
script: script:
# --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763
# --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages
- mkdir build - mkdir build
- cd build - cd build
# Disable -static-pie due to build error with system libc: # Disable -static-pie due to build error with system libc:
# https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438
- ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh --disable-pie - ../configure --enable-debug --static --disable-system --disable-pie
|| { 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 --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1 - make --output-sync -j`nproc --ignore=40` check V=1
@ -26,11 +24,11 @@ ubuntu-20.04-aarch64-all-linux-static:
- make --output-sync -j`nproc --ignore=40` check-tcg V=1 - make --output-sync -j`nproc --ignore=40` check-tcg V=1
|| { cat meson-logs/testlog.txt; exit 1; } ; || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-all: ubuntu-22.04-aarch64-all:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -42,17 +40,17 @@ ubuntu-20.04-aarch64-all:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- ../configure --disable-libssh - ../configure
|| { 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 --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1 - make --output-sync -j`nproc --ignore=40` check V=1
|| { cat meson-logs/testlog.txt; exit 1; } ; || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-alldbg: ubuntu-22.04-aarch64-alldbg:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -60,18 +58,18 @@ ubuntu-20.04-aarch64-alldbg:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- ../configure --enable-debug --disable-libssh - ../configure --enable-debug
|| { cat config.log meson-logs/meson-log.txt; exit 1; } || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make clean - make clean
- make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1 - make --output-sync -j`nproc --ignore=40` check V=1
|| { cat meson-logs/testlog.txt; exit 1; } ; || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-clang: ubuntu-22.04-aarch64-clang:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -89,11 +87,11 @@ ubuntu-20.04-aarch64-clang:
- make --output-sync -j`nproc --ignore=40` check V=1 - make --output-sync -j`nproc --ignore=40` check V=1
|| { cat meson-logs/testlog.txt; exit 1; } ; || { cat meson-logs/testlog.txt; exit 1; } ;
ubuntu-20.04-aarch64-tci: ubuntu-22.04-aarch64-tci:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -105,15 +103,15 @@ ubuntu-20.04-aarch64-tci:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- ../configure --disable-libssh --enable-tcg-interpreter - ../configure --enable-tcg-interpreter
|| { 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 --ignore=40` - make --output-sync -j`nproc --ignore=40`
ubuntu-20.04-aarch64-notcg: ubuntu-22.04-aarch64-notcg:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_20.04 - ubuntu_22.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -125,7 +123,7 @@ ubuntu-20.04-aarch64-notcg:
script: script:
- mkdir build - mkdir build
- cd build - cd build
- ../configure --disable-libssh --disable-tcg - ../configure --disable-tcg
|| { 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 --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1 - make --output-sync -j`nproc --ignore=40` check V=1

3
MAINTAINERS

@ -3724,7 +3724,8 @@ GitLab custom runner (Works On Arm Sponsored)
M: Alex Bennée <alex.bennee@linaro.org> M: Alex Bennée <alex.bennee@linaro.org>
M: Philippe Mathieu-Daudé <f4bug@amsat.org> M: Philippe Mathieu-Daudé <f4bug@amsat.org>
S: Maintained S: Maintained
F: .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml F: .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
F: .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
Documentation Documentation
------------- -------------