From 66f59e7657d697a1c117808c6062fb0930423a0f Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 12 Jun 2026 22:23:16 +0100 Subject: [PATCH] CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32} The configuration uses a mix of dashes and underscores, which is irritating to develop for. Switch to using the underscore form consistently; it is the more common form and it has the benefit that it allows splitting on dashes to work sensibly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin Release-Acked-by: Oleksii Kurochko --- automation/gitlab-ci/build.yaml | 154 +++++----- automation/gitlab-ci/test.yaml | 280 +++++++++--------- .../{xtf-x86-64-config => xtf-x86_64-config} | 0 ...86-64-efi-config => xtf-x86_64-efi-config} | 0 .../include/{xtf-x86-64 => xtf-x86_64} | 0 .../{xtf-x86-64-efi => xtf-x86_64-efi} | 0 .../{qubes-x86-64.sh => qubes-x86_64.sh} | 0 7 files changed, 217 insertions(+), 217 deletions(-) rename automation/scripts/include/configs/{xtf-x86-64-config => xtf-x86_64-config} (100%) rename automation/scripts/include/configs/{xtf-x86-64-efi-config => xtf-x86_64-efi-config} (100%) rename automation/scripts/include/{xtf-x86-64 => xtf-x86_64} (100%) rename automation/scripts/include/{xtf-x86-64-efi => xtf-x86_64-efi} (100%) rename automation/scripts/{qubes-x86-64.sh => qubes-x86_64.sh} (100%) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index fa054a8280..d5929e34ec 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -36,77 +36,77 @@ CXX: clang++ clang: y -.x86-64-build-tmpl: +.x86_64-build-tmpl: <<: *build variables: XEN_TARGET_ARCH: x86_64 tags: - x86_64 -.x86-64-build: - extends: .x86-64-build-tmpl +.x86_64-build: + extends: .x86_64-build-tmpl variables: debug: n -.x86-64-build-debug: - extends: .x86-64-build-tmpl +.x86_64-build-debug: + extends: .x86_64-build-tmpl variables: debug: y -.x86-32-build-tmpl: +.x86_32-build-tmpl: <<: *build variables: XEN_TARGET_ARCH: x86_32 tags: - x86_32 -.x86-32-build: - extends: .x86-32-build-tmpl +.x86_32-build: + extends: .x86_32-build-tmpl variables: debug: n -.x86-32-build-debug: - extends: .x86-32-build-tmpl +.x86_32-build-debug: + extends: .x86_32-build-tmpl variables: debug: y -.gcc-x86-64-build: - extends: .x86-64-build +.gcc-x86_64-build: + extends: .x86_64-build variables: <<: *gcc -.gcc-x86-64-build-debug: - extends: .x86-64-build-debug +.gcc-x86_64-build-debug: + extends: .x86_64-build-debug variables: <<: *gcc -.gcc-x86-32-build: - extends: .x86-32-build +.gcc-x86_32-build: + extends: .x86_32-build variables: <<: *gcc -.gcc-x86-32-build-debug: - extends: .x86-32-build-debug +.gcc-x86_32-build-debug: + extends: .x86_32-build-debug variables: <<: *gcc -.clang-x86-64-build: - extends: .x86-64-build +.clang-x86_64-build: + extends: .x86_64-build variables: <<: *clang -.clang-x86-64-build-debug: - extends: .x86-64-build-debug +.clang-x86_64-build-debug: + extends: .x86_64-build-debug variables: <<: *clang -.clang-x86-32-build: - extends: .x86-32-build +.clang-x86_32-build: + extends: .x86_32-build variables: <<: *clang -.clang-x86-32-build-debug: - extends: .x86-32-build-debug +.clang-x86_32-build-debug: + extends: .x86_32-build-debug variables: <<: *clang @@ -244,25 +244,25 @@ tags: - arm64 -.yocto-test-x86-64: +.yocto-test-x86_64: extends: .yocto-test tags: - x86_64 -.x86-64-cross-build-tmpl: +.x86_64-cross-build-tmpl: <<: *build variables: XEN_TARGET_ARCH: x86_64 tags: - arm64 -.x86-64-cross-build: - extends: .x86-64-cross-build-tmpl +.x86_64-cross-build: + extends: .x86_64-cross-build-tmpl variables: debug: n -.gcc-x86-64-cross-build: - extends: .x86-64-cross-build +.gcc-x86_64-cross-build: + extends: .x86_64-cross-build variables: <<: *gcc @@ -271,13 +271,13 @@ # Build jobs needed for tests alpine-3.24-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build <<: *build-test variables: CONTAINER: alpine:3.24-x86_64 alpine-3.24-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug <<: *build-test variables: CONTAINER: alpine:3.24-x86_64 @@ -292,13 +292,13 @@ alpine-3.24-x86_64-gcc-debug: CONFIG_XHCI=y debian-13-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug <<: *build-test variables: CONTAINER: debian:13-x86_64 debian-13-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug <<: *build-test variables: CONTAINER: debian:13-x86_64 @@ -482,14 +482,14 @@ yocto-qemuarm: YOCTO_OUTPUT: --copy-output yocto-qemux86-64: - extends: .yocto-test-x86-64 + extends: .yocto-test-x86_64 variables: YOCTO_BOARD: qemux86-64 # Cppcheck analysis jobs debian-12-x86_64-gcc-cppcheck: - extends: .gcc-x86-64-cross-build + extends: .gcc-x86_64-cross-build variables: CONTAINER: debian:12-arm64v8-cppcheck CROSS_COMPILE: /usr/bin/x86_64-linux-gnu- @@ -514,29 +514,29 @@ debian-12-arm64-gcc-cppcheck: # Build jobs not needed for tests alpine-3.24-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: alpine:3.24-x86_64 alpine-3.24-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: alpine:3.24-x86_64 archlinux-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: archlinux:current-x86_64 allow_failure: true archlinux-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: archlinux:current-x86_64 allow_failure: true debian-12-x86_64-gcc-ibt: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:12-x86_64-gcc-ibt RANDCONFIG: y @@ -544,42 +544,42 @@ debian-12-x86_64-gcc-ibt: CONFIG_XEN_IBT=y debian-12-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: debian:12-x86_64 debian-12-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: debian:12-x86_64 debian-12-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:12-x86_64 debian-12-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: debian:12-x86_64 debian-12-x86_32-clang-debug: - extends: .clang-x86-32-build-debug + extends: .clang-x86_32-build-debug variables: CONTAINER: debian:12-x86_32 debian-12-x86_32-gcc-debug: - extends: .gcc-x86-32-build-debug + extends: .gcc-x86_32-build-debug variables: CONTAINER: debian:12-x86_32 debian-13-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: debian:13-x86_64 debian-13-x86_64-clang-randconfig: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: debian:13-x86_64 RANDCONFIG: y @@ -587,136 +587,136 @@ debian-13-x86_64-clang-randconfig: CONFIG_COVERAGE=n # Disable coverage otherwise build times out. debian-13-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:13-x86_64 debian-13-x86_64-gcc-randconfig: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:13-x86_64 RANDCONFIG: y debian-13-x86_32-clang-debug: - extends: .clang-x86-32-build-debug + extends: .clang-x86_32-build-debug variables: CONTAINER: debian:13-x86_32 debian-13-x86_32-gcc-debug: - extends: .gcc-x86-32-build-debug + extends: .gcc-x86_32-build-debug variables: CONTAINER: debian:13-x86_32 fedora-43-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: fedora:43-x86_64 fedora-43-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: fedora:43-x86_64 ubuntu-18.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:18.04-x86_64 ubuntu-18.04-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: ubuntu:18.04-x86_64 ubuntu-20.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:20.04-x86_64 ubuntu-22.04-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: ubuntu:22.04-x86_64 ubuntu-22.04-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: ubuntu:22.04-x86_64 ubuntu-22.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:22.04-x86_64 ubuntu-24.04-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: ubuntu:24.04-x86_64 ubuntu-24.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:24.04-x86_64 ubuntu-26.04-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: ubuntu:26.04-x86_64 ubuntu-26.04-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: ubuntu:26.04-x86_64 ubuntu-26.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:26.04-x86_64 ubuntu-26.04-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: ubuntu:26.04-x86_64 opensuse-leap-16.0-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: opensuse:leap-16.0-x86_64 opensuse-leap-16.0-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: opensuse:leap-16.0-x86_64 opensuse-leap-16.0-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: opensuse:leap-16.0-x86_64 opensuse-leap-16.0-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: opensuse:leap-16.0-x86_64 opensuse-tumbleweed-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true opensuse-tumbleweed-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true opensuse-tumbleweed-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true opensuse-tumbleweed-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index cae8dfe970..87b2018a29 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -21,7 +21,7 @@ job: microcode-x86 ref: $ARTIFACTS_BRANCH -.x86-64-test-needs: &x86-64-test-needs +.x86_64-test-needs: &x86_64-test-needs - project: $ARTIFACTS_REPO job: $LINUX_JOB_X86_64 ref: $ARTIFACTS_BRANCH @@ -58,11 +58,11 @@ tags: - arm64 -.qemu-x86-64: +.qemu-x86_64: extends: .test-jobs-common variables: CONTAINER: debian:13-x86_64 - LOGFILE: qemu-smoke-x86-64.log + LOGFILE: qemu-smoke-x86_64.log artifacts: paths: - smoke.serial @@ -71,8 +71,8 @@ tags: - x86_64 -.qemu-smoke-x86-64: - extends: .qemu-x86-64 +.qemu-smoke-x86_64: + extends: .qemu-x86_64 variables: TEST_TIMEOUT_OVERRIDE: 120 @@ -141,7 +141,7 @@ tags: - xilinx-crater-001 -.adl-x86-64: +.adl-x86_64: extends: .test-jobs-common variables: # the test controller runs on RPi4 @@ -164,9 +164,9 @@ tags: - qubes-hw2 -.kbl-x86-64: +.kbl-x86_64: # it's really similar to the ADL one - extends: .adl-x86-64 + extends: .adl-x86_64 variables: PCIDEV: "00:1f.6" PCIDEV_INTR: "MSI" @@ -175,9 +175,9 @@ tags: - qubes-hw3 -.zen2-x86-64: +.zen2-x86_64: # it's really similar to the above - extends: .adl-x86-64 + extends: .adl-x86_64 variables: PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" @@ -186,9 +186,9 @@ tags: - qubes-hw1 -.zen3p-x86-64: +.zen3p-x86_64: # it's really similar to the above - extends: .adl-x86-64 + extends: .adl-x86_64 variables: PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" @@ -235,7 +235,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug: script: - ./automation/scripts/xilinx-smoke-dom0-x86_64.sh ping 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug xilinx-smoke-dom0-x86_64-gcc-debug-argo: @@ -254,238 +254,238 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: job: microcode-x86 ref: master -adl-smoke-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-smoke-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-smoke-x86-64-dom0pvh-gcc-debug: - extends: .adl-x86-64 +adl-smoke-x86_64-dom0pvh-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-smoke-x86-64-dom0pvh-hvm-gcc-debug: - extends: .adl-x86-64 +adl-smoke-x86_64-dom0pvh-hvm-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-suspend-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-suspend-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-pci-pv-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-pci-pv-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-pci-hvm-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-pci-hvm-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-pvshim-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-pvshim-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-tools-tests-pv-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-tools-tests-pv-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -adl-tools-tests-pvh-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-tools-tests-pvh-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-smoke-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-smoke-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-smoke-x86-64-dom0pvh-gcc-debug: - extends: .kbl-x86-64 +kbl-smoke-x86_64-dom0pvh-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: - extends: .kbl-x86-64 +kbl-smoke-x86_64-dom0pvh-hvm-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-suspend-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-suspend-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-pci-pv-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-pci-pv-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-pci-hvm-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-pci-hvm-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-pvshim-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-pvshim-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-tools-tests-pv-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-tools-tests-pv-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -kbl-tools-tests-pvh-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-tools-tests-pvh-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen2-smoke-x86-64-gcc-debug: - extends: .zen2-x86-64 +zen2-smoke-x86_64-gcc-debug: + extends: .zen2-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen2-suspend-x86-64-gcc-debug: - extends: .zen2-x86-64 +zen2-suspend-x86_64-gcc-debug: + extends: .zen2-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-smoke-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-smoke-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-smoke-x86-64-dom0pvh-gcc-debug: - extends: .zen3p-x86-64 +zen3p-smoke-x86_64-dom0pvh-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug: - extends: .zen3p-x86-64 +zen3p-smoke-x86_64-dom0pvh-hvm-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-pci-hvm-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-pci-hvm-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-pvshim-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-pvshim-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-tools-tests-pv-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-tools-tests-pv-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug -zen3p-tools-tests-pvh-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-tools-tests-pvh-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug qemu-smoke-dom0-arm64-gcc: @@ -649,54 +649,54 @@ qemu-smoke-dom0less-arm32-gcc-debug-earlyprintk: - debian-12-arm32-gcc-debug-earlyprintk qemu-alpine-x86_64-gcc: - extends: .qemu-x86-64 + extends: .qemu-x86_64 script: - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc -qemu-smoke-x86-64-gcc: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-gcc: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 pv64 example 2>&1 | tee ${LOGFILE} needs: - debian-13-x86_64-gcc-debug -qemu-smoke-x86-64-clang: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-clang: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 pv64 example 2>&1 | tee ${LOGFILE} needs: - debian-13-x86_64-clang-debug -qemu-smoke-x86-64-gcc-pvh: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-gcc-pvh: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 hvm64 example 2>&1 | tee ${LOGFILE} needs: - debian-13-x86_64-gcc-debug -qemu-smoke-x86-64-clang-pvh: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-clang-pvh: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 hvm64 example 2>&1 | tee ${LOGFILE} needs: - debian-13-x86_64-clang-debug -qemu-smoke-x86-64-gcc-efi: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-gcc-efi: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64-efi pv64 example 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64-efi pv64 example 2>&1 | tee ${LOGFILE} needs: - debian-13-x86_64-gcc-debug qemu-xtf-argo-x86_64-gcc-debug: - extends: .qemu-smoke-x86-64 + extends: .qemu-smoke-x86_64 variables: TEST_TIMEOUT_OVERRIDE: 60 script: - - ./automation/scripts/qemu-xtf.sh x86-64 pv64 argo 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 pv64 argo 2>&1 | tee ${LOGFILE} needs: - alpine-3.24-x86_64-gcc-debug diff --git a/automation/scripts/include/configs/xtf-x86-64-config b/automation/scripts/include/configs/xtf-x86_64-config similarity index 100% rename from automation/scripts/include/configs/xtf-x86-64-config rename to automation/scripts/include/configs/xtf-x86_64-config diff --git a/automation/scripts/include/configs/xtf-x86-64-efi-config b/automation/scripts/include/configs/xtf-x86_64-efi-config similarity index 100% rename from automation/scripts/include/configs/xtf-x86-64-efi-config rename to automation/scripts/include/configs/xtf-x86_64-efi-config diff --git a/automation/scripts/include/xtf-x86-64 b/automation/scripts/include/xtf-x86_64 similarity index 100% rename from automation/scripts/include/xtf-x86-64 rename to automation/scripts/include/xtf-x86_64 diff --git a/automation/scripts/include/xtf-x86-64-efi b/automation/scripts/include/xtf-x86_64-efi similarity index 100% rename from automation/scripts/include/xtf-x86-64-efi rename to automation/scripts/include/xtf-x86_64-efi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86_64.sh similarity index 100% rename from automation/scripts/qubes-x86-64.sh rename to automation/scripts/qubes-x86_64.sh