gitlab-ci.yml: Add new s390x targets to run tests with TCG and KVM accel
PATCH 1/1 gitlab-ci.yml: Add new s390x targets to run tests with TCG and KVM accel
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
--- .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
.gitlab-ci.yml +28 -0
@@ -155,3 +155,31 @@ cirrus-ci-macos-i386: cirrus-ci-macos-x86-64: <<: *cirrus_build_job_definition + +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288 + stsi sclp-1g sclp-3g + | tee results.txt + - if grep -q FAIL results.txt ; then exit 1 ; fi + +test-s390x-kvm: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=kvm ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288 + stsi sclp-1g sclp-3g + | tee results.txt + - if grep -q FAIL results.txt ; then exit 1 ; fi
Signature · 1 line
2.26.2
Paolo Bonzini
maintainerQuoted 37 lines · Marcelo Bandeira Condotta
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
Signed-off-by Marcelo Bandeira Condotta <[email protected]>--- .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+).gitlab-ci.yml +18
-0@@ -155,3 +155,31 @@ cirrus-ci-macos-i386: cirrus-ci-macos-x86-64: <<: *cirrus_build_job_definition + +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288 + stsi sclp-1g sclp-3g + | tee results.txt + - if grep -q FAIL results.txt ; then exit 1 ; fi + +test-s390x-kvm: + stage: test + before_script: []
.gitlab-ci.yml cirrus-ci-macos-i386: · line 185
Quoted 10 lines
.gitlab-ci.yml +10
-0+ tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=kvm ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288 + stsi sclp-1g sclp-3g + | tee results.txt + - if grep -q FAIL results.txt ; then exit 1 ; fi
So it will have a custom runner? That's nice!
Do you have an example run already?
Paolo
Thomas Huth
Acked-byQuoted 40 lines · Paolo Bonzini
Quoted 39 lines · Marcelo Bandeira Condotta
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
Signed-off-by Marcelo Bandeira Condotta <[email protected]>---
.gitlab-ci.yml | 28 ++++++++++++++++++++++++++++1 file changed, 28 insertions(+).gitlab-ci.yml +0
-0@@ -155,3 +155,31 @@ cirrus-ci-macos-i386:cirrus-ci-macos-x86-64:
<<:*cirrus_build_job_definition.gitlab-ci.yml +11
-0+ +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vectordiag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fi.gitlab-ci.yml +7
-0+ +test-s390x-kvm: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script:
Quoted 8 lines
Quoted 8 lines
+ - ./configure --arch=s390x
+ - make -j2
+ - ACCEL=kvm ./run_tests.sh
+ selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fi
Quoted 4 lines
So it will have a custom runner? That's nice!
Do you have an example run already?
I've been in touch with Marcelo during the past days already, and I've already registered the runner that he set up on the s390x machine, so it should theoretically work now once this patch has been merged.
Thomas
Paolo Bonzini
maintainerQuoted 53 lines · Thomas Huth
Quoted 40 lines · Paolo Bonzini
Quoted 39 lines · Marcelo Bandeira Condotta
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
Signed-off-by Marcelo Bandeira Condotta <[email protected]>---
.gitlab-ci.yml | 28 ++++++++++++++++++++++++++++1 file changed, 28 insertions(+).gitlab-ci.yml +0
-0@@ -155,3 +155,31 @@ cirrus-ci-macos-i386:cirrus-ci-macos-x86-64:
<<:*cirrus_build_job_definition.gitlab-ci.yml +11
-0+ +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308vector diag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fi.gitlab-ci.yml +7
-0+ +test-s390x-kvm: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script:Quoted 8 lines
Quoted 8 lines
+ - ./configure --arch=s390x
+ - make -j2
+ - ACCEL=kvm ./run_tests.sh
+ selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fiAcked-by Thomas Huth <[email protected]>Quoted 1 line
Quoted 5 lines
Quoted 3 lines
So it will have a custom runner? That's nice!
Do you have an example run already?
I've been in touch with Marcelo during the past days already, and I've already registered the runner that he set up on the s390x machine, so it should theoretically work now once this patch has been merged.
What's the reason to add test-s390x-tcg? It would really cover only a different TCG backend.
Paolo
Quoted 54 lines · Paolo Bonzini
Quoted 53 lines · Thomas Huth
Quoted 40 lines · Paolo Bonzini
Quoted 39 lines · Marcelo Bandeira Condotta
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
Signed-off-by Marcelo Bandeira Condotta <[email protected]>---
.gitlab-ci.yml | 28 ++++++++++++++++++++++++++++1 file changed, 28 insertions(+).gitlab-ci.yml +0
-0@@ -155,3 +155,31 @@ cirrus-ci-macos-i386:cirrus-ci-macos-x86-64:
<<:*cirrus_build_job_definition.gitlab-ci.yml +11
-0+ +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vectordiag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fi.gitlab-ci.yml +7
-0+ +test-s390x-kvm: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script:Quoted 8 lines
Quoted 8 lines
+ - ./configure --arch=s390x
+ - make -j2
+ - ACCEL=kvm ./run_tests.sh
+ selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fiAcked-by Thomas Huth <[email protected]>Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
So it will have a custom runner? That's nice!
Do you have an example run already?
I've been in touch with Marcelo during the past days already, and I've already registered the runner that he set up on the s390x machine, so it should theoretically work now once this patch has been merged.
What's the reason to add test-s390x-tcg? It would really cover only a different TCG backend.
I've removed the tcg target from the patch, changed it so that it now runs all s390x tests (the ones that do not work are skipped automatically), and restricted the job to projects where a variable called S390X_Z15_RUNNER_AVAILABLE has been set (so that the job does not get stuck on systems where the runner is not available), and finally pushed it to the master branch, so we should have automatic test coverage on s390x now. Thank you very much, Marcelo!
Thomas
Quoted 57 lines · Thomas Huth
Quoted 56 lines · Paolo Bonzini
Quoted 55 lines · Thomas Huth
Quoted 40 lines · Paolo Bonzini
Quoted 39 lines · Marcelo Bandeira Condotta
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
Signed-off-by Marcelo Bandeira Condotta <[email protected]>---
.gitlab-ci.yml | 28 ++++++++++++++++++++++++++++1 file changed, 28 insertions(+).gitlab-ci.yml +0
-0@@ -155,3 +155,31 @@ cirrus-ci-macos-i386:cirrus-ci-macos-x86-64:
<<:*cirrus_build_job_definition.gitlab-ci.yml +11
-0+ +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308vector diag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fi.gitlab-ci.yml +7
-0+ +test-s390x-kvm: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script:Quoted 8 lines
Quoted 8 lines
+ - ./configure --arch=s390x
+ - make -j2
+ - ACCEL=kvm ./run_tests.sh
+ selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288
+ stsi sclp-1g sclp-3g
+ | tee results.txt
+ - if grep -q FAIL results.txt ; then exit 1 ; fiAcked-by Thomas Huth <[email protected]>Quoted 3 lines
So it will have a custom runner? That's nice!
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Do you have an example run already?
I've been in touch with Marcelo during the past days already, and I've already registered the runner that he set up on the s390x machine, so it should theoretically work now once this patch has been merged.
What's the reason to add test-s390x-tcg? It would really cover only a different TCG backend.
I've removed the tcg target from the patch, changed it so that it now runs all s390x tests [...]
... and of course one of the tests ("smp") is flaky and succeeded on the staging branch, but failed on the master branch. Sigh.
I've pushed yet another patch on top to only run the solid tests now:
.gitlab-ci.yml +4 -1
@@ -163,7 +163,10 @@ s390x-kvm: script: - ./configure --arch=s390x - make -j$(nproc) - - ACCEL=kvm ./run_tests.sh | tee results.txt + - ACCEL=kvm ./run_tests.sh + selftest-setup intercept emulator sieve sthyi skey diag10 diag308 pfmf + cmm vector gs iep cpumodel diag288 stsi sclp-1g sclp-3g css skrf sie + | tee results.txt - grep -q PASS results.txt && ! grep -q FAIL results.txt only: variables:
Thomas
Paolo Bonzini
maintainerQuoted 37 lines · Marcelo Bandeira Condotta
From: Marcelo Bandeira Condotta <[email protected]>
A new s390x z15 VM provided by IBM Community Cloud will be used to run the s390x KVM Unit tests natively with both TCG and KVM accel options.
Signed-off-by Marcelo Bandeira Condotta <[email protected]>--- .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+).gitlab-ci.yml +18
-0@@ -155,3 +155,31 @@ cirrus-ci-macos-i386: cirrus-ci-macos-x86-64: <<: *cirrus_build_job_definition + +test-s390x-tcg: + stage: test + before_script: [] + tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=tcg ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288 + stsi sclp-1g sclp-3g + | tee results.txt + - if grep -q FAIL results.txt ; then exit 1 ; fi + +test-s390x-kvm: + stage: test + before_script: []
.gitlab-ci.yml cirrus-ci-macos-i386: · line 185
Quoted 10 lines
.gitlab-ci.yml +10
-0+ tags: + - s390x-z15-vm + script: + - ./configure --arch=s390x + - make -j2 + - ACCEL=kvm ./run_tests.sh + selftest-setup intercept emulator sieve skey diag10 diag308 vector diag288 + stsi sclp-1g sclp-3g + | tee results.txt + - if grep -q FAIL results.txt ; then exit 1 ; fi
There is still a problem, in that every contributor's CI runs will mark the s390 as job as pending. I think you should use variables to enable these tests only on forks that want them.
While at it, I agree with Thomas on testing {clang,GCC} on KVM rather than GCC on {KVM,TCG}.
Thanks!
Paolo