All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org,
	aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com,
	crosa@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>
Subject: [PATCH v2 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs
Date: Wed, 14 Sep 2022 16:59:40 +0100	[thread overview]
Message-ID: <20220914155950.804707-21-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org>

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: <20220826172128.353798-15-alex.bennee@linaro.org>

---
v2
  - fix extra-cflags merge conflict
  - update MAINTAINERS
---
 .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 +++++++++----------
 MAINTAINERS                                   |  3 +-
 4 files changed, 24 insertions(+), 25 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} (82%)

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 82%
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 3f4dee4f86..ce0b18af6f 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
+ - ../configure --enable-debug --static --disable-system --disable-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
diff --git a/MAINTAINERS b/MAINTAINERS
index 1729c0901c..738c4eb647 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3724,7 +3724,8 @@ GitLab custom runner (Works On Arm Sponsored)
 M: Alex Bennée <alex.bennee@linaro.org>
 M: Philippe Mathieu-Daudé <f4bug@amsat.org>
 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
 -------------
-- 
2.34.1



  parent reply	other threads:[~2022-09-14 16:48 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-14 15:59 [PATCH v2 00/30] testing/next pre-PR (testing update and mips deprecation) Alex Bennée
2022-09-14 15:59 ` [PATCH v2 01/30] gitlab: reduce targets in cross_user_build_job Alex Bennée
2022-09-15  8:21   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 02/30] tests/avocado/boot_linux_console: Fix the test_aarch64_xlnx_versal_virt test Alex Bennée
2022-09-14 15:59 ` [PATCH v2 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests Alex Bennée
2022-09-15  8:21   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 04/30] tests/avocado: add explicit timeout for s390 " Alex Bennée
2022-09-14 20:29   ` Thomas Huth
2022-09-14 15:59 ` [PATCH v2 05/30] tests/avocado: add explicit timeout for ppc64le " Alex Bennée
2022-09-15  8:22   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 06/30] tests/avocado: split the AST2x00Machine classes Alex Bennée
2022-09-15  8:24   ` Richard Henderson
2022-09-20 15:07     ` Alex Bennée
2022-09-14 15:59 ` [PATCH v2 07/30] tests/avocado: reduce the default timeout to 120s Alex Bennée
2022-09-15  8:24   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 08/30] tests/docker: update and flatten debian-alpha-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 09/30] tests/docker: update and flatten debian-hppa-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 10/30] tests/docker: update and flatten debian-m68k-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 11/30] tests/docker: update and flatten debian-mips64-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 12/30] tests/docker: update and flatten debian-sh4-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 13/30] tests/docker: update and flatten debian-sparc64-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 14/30] tests/docker: flatten debian-powerpc-test-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 15/30] tests/docker: remove tricore qemu/debian10 dependency Alex Bennée
2022-09-15  7:40   ` Thomas Huth
2022-09-14 15:59 ` [PATCH v2 16/30] tests/docker: remove amd64 " Alex Bennée
2022-09-14 15:59 ` [PATCH v2 17/30] tests/vm: Remove obsolete Fedora VM test Alex Bennée
2022-09-14 15:59 ` [PATCH v2 18/30] configure: explicitly set cflags for --disable-pie Alex Bennée
2022-09-15  8:27   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64 Alex Bennée
2022-09-15  7:41   ` Thomas Huth
2022-09-14 15:59 ` Alex Bennée [this message]
2022-09-15  7:42   ` [PATCH v2 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs Thomas Huth
2022-09-14 15:59 ` [PATCH v2 21/30] Deprecate 32 bit big-endian MIPS Alex Bennée
2022-09-15  8:34   ` Richard Henderson
2022-09-16  8:08     ` Pierre Muller
2022-09-16  8:38       ` Richard Henderson
2022-09-16 10:10         ` Pierre Muller
2022-09-16 10:22           ` Daniel P. Berrangé
2022-09-16 15:20             ` Philippe Mathieu-Daudé via
2022-09-16  9:33       ` Alex Bennée
2022-09-14 15:59 ` [PATCH v2 22/30] tests/docker: flatten debian-riscv64-test-cross Alex Bennée
2022-09-15  8:35   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 23/30] tests/docker: update and flatten debian-all-test-cross Alex Bennée
2022-09-15  8:36   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 24/30] tests/lcitool: bump to latest version Alex Bennée
2022-09-14 15:59 ` [PATCH v2 25/30] tests/docker: update and flatten debian-amd64-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 26/30] tests/docker: update and flatten debian-loongarch-cross Alex Bennée
2022-09-14 15:59 ` [PATCH v2 27/30] tests/docker: update and flatten debian-hexagon-cross Alex Bennée
2022-09-15  8:39   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 28/30] tests/docker: update and flatten debian-toolchain Alex Bennée
2022-09-15  8:40   ` Richard Henderson
2022-09-14 15:59 ` [PATCH v2 29/30] tests/docker: remove FROM qemu/ support from docker.py Alex Bennée
2022-09-15  8:41   ` Richard Henderson
2022-10-29  9:38     ` Stefan Weil via
2022-10-29 19:46       ` Paolo Bonzini
2022-10-29 21:13         ` Stefan Weil via
2022-10-30 14:17           ` Paolo Bonzini
2022-09-14 15:59 ` [PATCH v2 30/30] tests/docker: remove the Debian base images Alex Bennée
2022-09-15  8:42   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220914155950.804707-21-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.