Skip to contentSkip to conversation

Improvements for the device-crash-test jobs

PATCH In review Thomas Huth 2 participants 4 messages Apr 14, 2023 – Apr 17, 2023

lore
Share & tools
lore
#0 lore raw

cover Improvements for the device-crash-test jobs

Improve the runtime of the device-crash-test jobs by avoiding to run "configure" again and by forcing to test with TCG only (instead of testing twice, with TCG and KVM).

Thomas Huth (2):
gitlab-ci: Avoid to re-run "configure" in the device-crash-test jobs scripts/device-crash-test: Add a parameter to run with TCG only

 .gitlab-ci.d/buildtest.yml | 6 +++---
 scripts/device-crash-test  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
2.31.1
#2 lore raw

PATCH 2/2 scripts/device-crash-test: Add a parameter to run with TCG only

We're currently facing the problem that the device-crash-test script runs twice as long in the CI when a runner supports KVM - which sometimes results in a timeout of the CI job. To get a more deterministic runtime here, add an option to the script that allows to run it with TCG only.

---
 .gitlab-ci.d/buildtest.yml | 2 +-
 scripts/device-crash-test  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
.gitlab-ci.d/buildtest.yml +1 -1
index 333eea9dd3..bb3650a51c 100644
@@ -103,7 +103,7 @@ crash-test-debian:
   script:
     - cd build
     - make NINJA=":" check-venv
-    - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386
+    - tests/venv/bin/python3 scripts/device-crash-test -q --tcg-only ./qemu-system-i386
 
 build-system-fedora:
   extends:
scripts/device-crash-test +3 -1
index 73bcb98693..b74d887331 100755
@@ -397,7 +397,7 @@ def binariesToTest(args, testcase):
 
 
 def accelsToTest(args, testcase):
-    if getBinaryInfo(args, testcase['binary']).kvm_available:
+    if getBinaryInfo(args, testcase['binary']).kvm_available and not args.tcg_only:
         yield 'kvm'
     yield 'tcg'
 
@@ -510,6 +510,8 @@ def main():
                         help="Full mode: test cases that are expected to fail")
     parser.add_argument('--strict', action='store_true', dest='strict',
                         help="Treat all warnings as fatal")
+    parser.add_argument('--tcg-only', action='store_true', dest='tcg_only',
+                        help="Only test with TCG accelerator")
     parser.add_argument('qemu', nargs='*', metavar='QEMU',
                         help='QEMU binary to run')
     args = parser.parse_args()
Signature · 1 line
2.31.1
#1 lore raw

PATCH 1/2 gitlab-ci: Avoid to re-run "configure" in the device-crash-test jobs

In reply to Thomas Huth

After "make check-venv" had been added to these jobs, they started to re-run "configure" each time since our logic in the makefile thinks that some files are out of date here. Avoid it with the same trick that we are using in buildtest-template.yml already by disabling the up-to-date check via NINJA=":".

Fixes 1d8cf47e5b ("tests: run 'device-crash-test' from tests/venv")
---
 .gitlab-ci.d/buildtest.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.d/buildtest.yml +2 -2
index ba6f551752..333eea9dd3 100644
@@ -102,7 +102,7 @@ crash-test-debian:
     IMAGE: debian-amd64
   script:
     - cd build
-    - make check-venv
+    - make NINJA=":" check-venv
     - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386
 
 build-system-fedora:
@@ -145,7 +145,7 @@ crash-test-fedora:
     IMAGE: fedora
   script:
     - cd build
-    - make check-venv
+    - make NINJA=":" check-venv
     - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-ppc
     - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32
 
Signature · 1 line
2.31.1
#3 lore raw
In reply to Thomas Huth
Quoted 3 lines · Thomas Huth

Improve the runtime of the device-crash-test jobs by avoiding to run "configure" again and by forcing to test with TCG only (instead of testing twice, with TCG and KVM).

Queued to testing/next, thanks.

Signature · 2 lines
Alex Bennée
Virtualisation Tech Lead @ Linaro