[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 14/25] gitlab-ci: update aarch32/aarch64 custom runner jobs
From: |
Alex Bennée |
Subject: |
[PATCH v1 14/25] gitlab-ci: update aarch32/aarch64 custom runner jobs |
Date: |
Fri, 26 Aug 2022 18:21:17 +0100 |
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>
---
.gitlab-ci.d/custom-runners.yml | 4 +--
...4-aarch32.yml => ubuntu-22.04-aarch32.yml} | 6 ++--
...4-aarch64.yml => ubuntu-22.04-aarch64.yml} | 36 +++++++++----------
3 files changed, 22 insertions(+), 24 deletions(-)
rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-aarch32.yml =>
ubuntu-22.04-aarch32.yml} (86%)
rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-aarch64.yml =>
ubuntu-22.04-aarch64.yml} (81%)
diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 15aaccc481..97f99e29c2 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -15,6 +15,6 @@ variables:
include:
- 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-20.04-aarch32.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/centos-stream-8-x86_64.yml'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml
b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
similarity index 86%
rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
index cbfa9cc164..1a2f9b8dbe 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml
+++ b/.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
# "Install basic packages to build QEMU on Ubuntu 20.04"
-ubuntu-20.04-aarch32-all:
+ubuntu-22.04-aarch32-all:
needs: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch32
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~
/^staging/'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml
b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
similarity index 81%
rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
index 85a234801a..8db1e9376a 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml
+++ b/.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
# "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: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~
/^staging/'
- if: "$AARCH64_RUNNER_AVAILABLE"
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
- cd build
# Disable -static-pie due to build error with system libc:
# https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438
- - ../configure --enable-debug --static --disable-system --disable-glusterfs
--disable-libssh --disable-pie --extra-cflags='-fno-pie -no-pie'
+ - ../configure --enable-debug --static --disable-system --disable-pie
--extra-cflags='-fno-pie -no-pie'
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- 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
|| { cat meson-logs/testlog.txt; exit 1; } ;
-ubuntu-20.04-aarch64-all:
+ubuntu-22.04-aarch64-all:
needs: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~
/^staging/'
@@ -42,17 +40,17 @@ ubuntu-20.04-aarch64-all:
script:
- mkdir build
- cd build
- - ../configure --disable-libssh
+ - ../configure
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1
|| { cat meson-logs/testlog.txt; exit 1; } ;
-ubuntu-20.04-aarch64-alldbg:
+ubuntu-22.04-aarch64-alldbg:
needs: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~
/^staging/'
@@ -60,18 +58,18 @@ ubuntu-20.04-aarch64-alldbg:
script:
- mkdir build
- cd build
- - ../configure --enable-debug --disable-libssh
+ - ../configure --enable-debug
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make clean
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1
|| { cat meson-logs/testlog.txt; exit 1; } ;
-ubuntu-20.04-aarch64-clang:
+ubuntu-22.04-aarch64-clang:
needs: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch64
rules:
- 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
|| { cat meson-logs/testlog.txt; exit 1; } ;
-ubuntu-20.04-aarch64-tci:
+ubuntu-22.04-aarch64-tci:
needs: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~
/^staging/'
@@ -105,15 +103,15 @@ ubuntu-20.04-aarch64-tci:
script:
- mkdir build
- cd build
- - ../configure --disable-libssh --enable-tcg-interpreter
+ - ../configure --enable-tcg-interpreter
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
-ubuntu-20.04-aarch64-notcg:
+ubuntu-22.04-aarch64-notcg:
needs: []
stage: build
tags:
- - ubuntu_20.04
+ - ubuntu_22.04
- aarch64
rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~
/^staging/'
@@ -125,7 +123,7 @@ ubuntu-20.04-aarch64-notcg:
script:
- mkdir build
- cd build
- - ../configure --disable-libssh --disable-tcg
+ - ../configure --disable-tcg
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check V=1
--
2.30.2
- [PATCH v1 09/25] tests/docker: flatten debian-powerpc-test-cross, (continued)
- [PATCH v1 09/25] tests/docker: flatten debian-powerpc-test-cross, Alex Bennée, 2022/08/26
- [PATCH v1 13/25] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64, Alex Bennée, 2022/08/26
- [PATCH v1 07/25] tests/docker: update and flatten debian-sh4-cross, Alex Bennée, 2022/08/26
- [PATCH v1 12/25] tests/vm: Remove obsolete Fedora VM test, Alex Bennée, 2022/08/26
- [PATCH v1 04/25] tests/docker: update and flatten debian-hppa-cross, Alex Bennée, 2022/08/26
- [PATCH v1 10/25] tests/docker: remove tricore qemu/debian10 dependency, Alex Bennée, 2022/08/26
- [PATCH v1 14/25] gitlab-ci: update aarch32/aarch64 custom runner jobs,
Alex Bennée <=
- [PATCH v1 17/25] tests/docker: update and flatten debian-all-test-cross, Alex Bennée, 2022/08/26
- [PATCH v1 18/25] tests/lcitool: bump to latest version, Alex Bennée, 2022/08/26
- [PATCH v1 11/25] tests/docker: remove amd64 qemu/debian10 dependency, Alex Bennée, 2022/08/26
- [PATCH v1 15/25] Deprecate 32 bit big-endian MIPS, Alex Bennée, 2022/08/26