| Message ID | 20240227192109.487402-38-andrew.jones@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: EFI improvements | expand |
On 27/02/2024 19:21, Andrew Jones wrote: > Now that we have efi-direct and tests run much faster, add a few > (just selftests) to the CI. Test with both DT and ACPI. While > touching the file update arm and arm64's pass/fail criteria to > the new style that ensures they're not all skips. > > Signed-off-by: Andrew Jones <andrew.jones@linux.dev> Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> I really like --enable-efi-direct, thanks for adding support for this and all the clean-ups! Thanks, Nikos > --- > .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++-- > 1 file changed, 30 insertions(+), 2 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 71d986e9884e..ff34b1f5062e 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -44,7 +44,35 @@ build-aarch64: > selftest-vectors-user > timer > | tee results.txt > - - if grep -q FAIL results.txt ; then exit 1 ; fi > + - grep -q PASS results.txt && ! grep -q FAIL results.txt > + > +build-aarch64-efi: > + extends: .intree_template > + script: > + - dnf install -y qemu-system-aarch64 gcc-aarch64-linux-gnu edk2-aarch64 > + - ./configure --arch=aarch64 --cross-prefix=aarch64-linux-gnu- --enable-efi --enable-efi-direct > + - make -j2 > + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh > + selftest-setup > + selftest-smp > + selftest-vectors-kernel > + selftest-vectors-user > + | tee results.txt > + - grep -q PASS results.txt && ! grep -q FAIL results.txt > + > +build-aarch64-efi-acpi: > + extends: .intree_template > + script: > + - dnf install -y qemu-system-aarch64 gcc-aarch64-linux-gnu edk2-aarch64 > + - ./configure --arch=aarch64 --cross-prefix=aarch64-linux-gnu- --enable-efi --enable-efi-direct > + - make -j2 > + - EFI_USE_ACPI=y ACCEL=tcg MAX_SMP=8 ./run_tests.sh > + selftest-setup > + selftest-smp > + selftest-vectors-kernel > + selftest-vectors-user > + | tee results.txt > + - grep -q PASS results.txt && ! grep -q FAIL results.txt > > build-arm: > extends: .outoftree_template > @@ -59,7 +87,7 @@ build-arm: > pci-test pmu-cycle-counter gicv2-ipi gicv2-mmio gicv3-ipi gicv2-active > gicv3-active > | tee results.txt > - - if grep -q FAIL results.txt ; then exit 1 ; fi > + - grep -q PASS results.txt && ! grep -q FAIL results.txt > > build-ppc64be: > extends: .outoftree_template
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71d986e9884e..ff34b1f5062e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,35 @@ build-aarch64: selftest-vectors-user timer | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi + - grep -q PASS results.txt && ! grep -q FAIL results.txt + +build-aarch64-efi: + extends: .intree_template + script: + - dnf install -y qemu-system-aarch64 gcc-aarch64-linux-gnu edk2-aarch64 + - ./configure --arch=aarch64 --cross-prefix=aarch64-linux-gnu- --enable-efi --enable-efi-direct + - make -j2 + - ACCEL=tcg MAX_SMP=8 ./run_tests.sh + selftest-setup + selftest-smp + selftest-vectors-kernel + selftest-vectors-user + | tee results.txt + - grep -q PASS results.txt && ! grep -q FAIL results.txt + +build-aarch64-efi-acpi: + extends: .intree_template + script: + - dnf install -y qemu-system-aarch64 gcc-aarch64-linux-gnu edk2-aarch64 + - ./configure --arch=aarch64 --cross-prefix=aarch64-linux-gnu- --enable-efi --enable-efi-direct + - make -j2 + - EFI_USE_ACPI=y ACCEL=tcg MAX_SMP=8 ./run_tests.sh + selftest-setup + selftest-smp + selftest-vectors-kernel + selftest-vectors-user + | tee results.txt + - grep -q PASS results.txt && ! grep -q FAIL results.txt build-arm: extends: .outoftree_template @@ -59,7 +87,7 @@ build-arm: pci-test pmu-cycle-counter gicv2-ipi gicv2-mmio gicv3-ipi gicv2-active gicv3-active | tee results.txt - - if grep -q FAIL results.txt ; then exit 1 ; fi + - grep -q PASS results.txt && ! grep -q FAIL results.txt build-ppc64be: extends: .outoftree_template
Now that we have efi-direct and tests run much faster, add a few (just selftests) to the CI. Test with both DT and ACPI. While touching the file update arm and arm64's pass/fail criteria to the new style that ensures they're not all skips. Signed-off-by: Andrew Jones <andrew.jones@linux.dev> --- .gitlab-ci.yml | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)