ci: Regenerate with new lcitool

Re-generate our CI infra with 'lcitool' as of:

  commit b346752e98bd12395233ebba8c9312e08212b639 (HEAD)
  Author: Erik Skultety <eskultet@redhat.com>
  Date:   Tue Feb 1 10:48:53 2022 +0100

      tests: Replace CentOS 8 with AlmaLinux 8 in test scenarios

      Switch the test target before actually dropping CentOS 8.

      Signed-off-by: Erik Skultety <eskultet@redhat.com>
This is prior to upstream lcitool dropping 'centos-8' support to
minimize the differences.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index 03dee70480eb75f97c5164f10de469df3be9360f..48e6363c7c2461aa8fa80cae4c46f051c9df5627 100644 (file)
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -395,9 +395,9 @@ x86_64-centos-8-clang:
     - x86_64-centos-8-container
   allow_failure: false
   variables:
+    CC: clang
     NAME: centos-8
     RPM: skip
-    CC: clang
 
 
 x86_64-centos-stream-8:
@@ -408,6 +408,7 @@ x86_64-centos-stream-8:
   variables:
     NAME: centos-stream-8
 
+
 x86_64-centos-stream-9:
   extends: .native_build_job
   needs:
@@ -416,6 +417,7 @@ x86_64-centos-stream-9:
   variables:
     NAME: centos-stream-9
 
+
 x86_64-debian-10:
   extends: .native_build_job
   needs:
@@ -485,8 +487,8 @@ x86_64-fedora-rawhide-clang:
     - x86_64-fedora-rawhide-container
   allow_failure: true
   variables:
-    NAME: fedora-rawhide
     CC: clang
+    NAME: fedora-rawhide
     RPM: skip
 
 
@@ -525,9 +527,9 @@ x86_64-ubuntu-2004:
     - x86_64-ubuntu-2004-container
   allow_failure: false
   variables:
-    NAME: ubuntu-2004
     ASAN_OPTIONS: verify_asan_link_order=0
     MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+    NAME: ubuntu-2004
     UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
 
 
@@ -537,9 +539,9 @@ x86_64-ubuntu-2004-clang:
     - x86_64-ubuntu-2004-container
   allow_failure: false
   variables:
-    NAME: ubuntu-2004
     CC: clang
     MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined
+    NAME: ubuntu-2004
     UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
 
 
@@ -552,8 +554,8 @@ armv6l-debian-10:
     - armv6l-debian-10-container
   allow_failure: false
   variables:
-    NAME: debian-10
     CROSS: armv6l
+    NAME: debian-10
 
 
 mips-debian-10:
@@ -562,8 +564,8 @@ mips-debian-10:
     - mips-debian-10-container
   allow_failure: false
   variables:
-    NAME: debian-10
     CROSS: mips
+    NAME: debian-10
 
 
 mipsel-debian-10:
@@ -572,8 +574,8 @@ mipsel-debian-10:
     - mipsel-debian-10-container
   allow_failure: false
   variables:
-    NAME: debian-10
     CROSS: mipsel
+    NAME: debian-10
 
 
 armv7l-debian-11:
@@ -582,8 +584,8 @@ armv7l-debian-11:
     - armv7l-debian-11-container
   allow_failure: false
   variables:
-    NAME: debian-11
     CROSS: armv7l
+    NAME: debian-11
 
 
 mips64el-debian-11:
@@ -592,8 +594,8 @@ mips64el-debian-11:
     - mips64el-debian-11-container
   allow_failure: false
   variables:
-    NAME: debian-11
     CROSS: mips64el
+    NAME: debian-11
 
 
 ppc64le-debian-11:
@@ -602,8 +604,8 @@ ppc64le-debian-11:
     - ppc64le-debian-11-container
   allow_failure: false
   variables:
-    NAME: debian-11
     CROSS: ppc64le
+    NAME: debian-11
 
 
 aarch64-debian-sid:
@@ -612,8 +614,8 @@ aarch64-debian-sid:
     - aarch64-debian-sid-container
   allow_failure: true
   variables:
-    NAME: debian-sid
     CROSS: aarch64
+    NAME: debian-sid
 
 
 i686-debian-sid:
@@ -622,8 +624,8 @@ i686-debian-sid:
     - i686-debian-sid-container
   allow_failure: true
   variables:
-    NAME: debian-sid
     CROSS: i686
+    NAME: debian-sid
 
 
 s390x-debian-sid:
@@ -632,8 +634,8 @@ s390x-debian-sid:
     - s390x-debian-sid-container
   allow_failure: true
   variables:
-    NAME: debian-sid
     CROSS: s390x
+    NAME: debian-sid
 
 
 mingw64-fedora-35:
@@ -642,8 +644,8 @@ mingw64-fedora-35:
     - mingw64-fedora-35-container
   allow_failure: false
   variables:
-    NAME: fedora-35
     CROSS: mingw64
+    NAME: fedora-35
 
 
 mingw32-fedora-rawhide:
@@ -652,8 +654,8 @@ mingw32-fedora-rawhide:
     - mingw32-fedora-rawhide-container
   allow_failure: true
   variables:
-    NAME: fedora-rawhide
     CROSS: mingw32
+    NAME: fedora-rawhide
 
 
 # Native cirrus build jobs
@@ -663,13 +665,13 @@ x86_64-freebsd-12:
   needs: []
   allow_failure: false
   variables:
-    NAME: freebsd-12
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_IMAGE_NAME: freebsd-12-2
+    CIRRUS_VM_IMAGE_SELECTOR: image_family
+    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    INSTALL_COMMAND: pkg install -y
+    NAME: freebsd-12
     UPDATE_COMMAND: pkg update
     UPGRADE_COMMAND: pkg upgrade -y
-    INSTALL_COMMAND: pkg install -y
 
 
 x86_64-freebsd-13:
@@ -677,13 +679,13 @@ x86_64-freebsd-13:
   needs: []
   allow_failure: false
   variables:
-    NAME: freebsd-13
-    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_IMAGE_NAME: freebsd-13-0
+    CIRRUS_VM_IMAGE_SELECTOR: image_family
+    CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
+    INSTALL_COMMAND: pkg install -y
+    NAME: freebsd-13
     UPDATE_COMMAND: pkg update
     UPGRADE_COMMAND: pkg upgrade -y
-    INSTALL_COMMAND: pkg install -y
 
 
 x86_64-macos-11:
@@ -691,12 +693,12 @@ x86_64-macos-11:
   needs: []
   allow_failure: false
   variables:
-    NAME: macos-11
-    CIRRUS_VM_INSTANCE_TYPE: osx_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image
     CIRRUS_VM_IMAGE_NAME: big-sur-base
-    UPDATE_COMMAND: brew update
-    UPGRADE_COMMAND: brew upgrade
+    CIRRUS_VM_IMAGE_SELECTOR: image
+    CIRRUS_VM_INSTANCE_TYPE: osx_instance
     INSTALL_COMMAND: brew install
+    NAME: macos-11
     PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
     PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
+    UPDATE_COMMAND: brew update
+    UPGRADE_COMMAND: brew upgrade