[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 6/6] CI: drop the riscv64 expect-based smoke test



qemu-smoke-qtb-riscv64-gcc boots Xen alone and waits for the same
"All set up" string on Xen's console as qemu-smoke-riscv64-gcc, so the
latter is redundant.

Drop qemu-smoke-riscv64-gcc, its .qemu-riscv64 template and
automation/scripts/qemu-smoke-riscv64.sh, which has no caller left.

Kept as a separate patch so it can be deferred until the QTB job has
proven itself.

Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Baptiste Le Duc <baptiste.le-duc@xxxxxxxxxx>
---
The debian:13-riscv64 container still installs qemu-system-riscv64 and
expect for the test phase, although nothing tests in it anymore. As it
needs a rebuild, dropping them is left to a follow-up if needed.
---
Changes in v3:
- New patch, split out of v2 "CI: run the riscv64 smoke test via QTB
  framework console-test".
---
 automation/gitlab-ci/test.yaml           | 20 --------------------
 automation/scripts/qemu-smoke-riscv64.sh | 19 -------------------
 2 files changed, 39 deletions(-)

diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index dcf75e4674..13f7ddfc7b 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -71,19 +71,6 @@
   variables:
     TEST_TIMEOUT_OVERRIDE: 120
 
-.qemu-riscv64:
-  extends: .test-jobs-common
-  variables:
-    CONTAINER: debian:13-riscv64
-    LOGFILE: qemu-smoke-riscv64.log
-  artifacts:
-    paths:
-      - smoke.serial
-      - '*.log'
-    when: always
-  tags:
-    - x86_64
-
 .qemu-qtb-riscv64:
   extends: .test-jobs-common
   variables:
@@ -805,13 +792,6 @@ qemu-xtf-argo-x86_64-gcc-debug:
   needs:
     - alpine-3.24-x86_64-gcc-debug
 
-qemu-smoke-riscv64-gcc:
-  extends: .qemu-riscv64
-  script:
-    - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
-  needs:
-    - debian-13-riscv64-gcc-debug
-
 qemu-smoke-qtb-riscv64-gcc:
   extends: .qemu-qtb-riscv64
   variables:
diff --git a/automation/scripts/qemu-smoke-riscv64.sh 
b/automation/scripts/qemu-smoke-riscv64.sh
deleted file mode 100755
index c0b1082a08..0000000000
--- a/automation/scripts/qemu-smoke-riscv64.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -ex -o pipefail
-
-# Run the test
-rm -f smoke.serial
-
-export TEST_CMD="qemu-system-riscv64 \
-    -M virt,aia=aplic-imsic \
-    -cpu rv64,svpbmt=on \
-    -smp 1 \
-    -nographic \
-    -m 2g \
-    -kernel binaries/xen"
-
-export TEST_LOG="smoke.serial"
-export PASSED="All set up"
-
-./automation/scripts/console.exp |& sed 's/\r\+$//'

-- 
2.56.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.