[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH] CI: Rename qubes-x86-64 parameter "" to "dom0pv"
This really is a legacy of not having parameters to start with. Give PV dom0 with a PVH domU a real name. Reformat the table to fix alignment. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- CC: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> --- automation/gitlab-ci/test.yaml | 8 ++++---- automation/scripts/qubes-x86-64.sh | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a603d4039aef..842cecf71382 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -257,7 +257,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -335,7 +335,7 @@ adl-tools-tests-pvh-x86-64-gcc-debug: kbl-smoke-x86-64-gcc-debug: extends: .kbl-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -413,7 +413,7 @@ kbl-tools-tests-pvh-x86-64-gcc-debug: zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug @@ -429,7 +429,7 @@ zen2-suspend-x86-64-gcc-debug: zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 script: - - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - alpine-3.18-gcc-debug diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index bfdd2ceb99ba..aa47ba6bf5c0 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -2,16 +2,16 @@ set -ex -o pipefail -# One of: -# - "" PV dom0, PVH domU -# - dom0pvh PVH dom0, PVH domU -# - dom0pvh-hvm PVH dom0, HVM domU -# - pci-hvm PV dom0, HVM domU + PCI Passthrough -# - pci-pv PV dom0, PV domU + PCI Passthrough -# - pvshim PV dom0, PVSHIM domU -# - s3 PV dom0, S3 suspend/resume -# - tools-tests-pv PV dom0, run tests from tools/tests/* -# - tools-tests-pvh PVH dom0, run tests from tools/tests/* +# One of: dom0: Testing: +# - dom0pv PV PVH domU +# - dom0pvh PVH PVH domU +# - dom0pvh-hvm PVH HVM domU +# - pci-hvm PV HVM domU + PCI Passthrough +# - pci-pv PV PV domU + PCI Passthrough +# - pvshim PV PVSHIM domU +# - s3 PV S3 suspend/resume +# - tools-tests-pv PV Run tests from tools/tests/* +# - tools-tests-pvh PVH Run tests from tools/tests/* test_variant=$1 ### defaults @@ -25,7 +25,7 @@ retrieve_xml= case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PVSHIM - ""|"dom0pvh"|"dom0pvh-hvm"|"pvshim") + "dom0pv"|"dom0pvh"|"dom0pvh-hvm"|"pvshim") passed="ping test passed" domU_check=" ifconfig eth0 192.168.0.2 -- 2.39.5
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |