From d0e56d97d4cd6d201313a4714860808b4c52d032 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Thu, 28 Mar 2019 18:00:00 +1100 Subject: ci: Remove debian-jessie boot test. Debian (in its infinite "wisdom") has decided to erase most evidence of there ever being a ppc64el installer for Debian Jessie. So, screw them. Backwards compatibility testing was for losers anyway. There is snapshot.debian.org, but it's *really* slow pulling things from there, so it's not really an option unless we want to add multiple minutes to test duration. Signed-off-by: Stewart Smith --- .gitignore | 2 - opal-ci/build-ubuntu-16.04.sh | 1 - opal-ci/build-ubuntu-18.04.sh | 1 - opal-ci/build-ubuntu-latest.sh | 1 - opal-ci/fetch-debian-jessie-installer.sh | 3 - test/Makefile.check | 5 +- test/run_qemu-jessie-debian-installer_boot_test.sh | 72 ---------------------- 7 files changed, 1 insertion(+), 84 deletions(-) delete mode 100755 opal-ci/fetch-debian-jessie-installer.sh delete mode 100755 test/run_qemu-jessie-debian-installer_boot_test.sh diff --git a/.gitignore b/.gitignore index fc09a0d..6303c81 100644 --- a/.gitignore +++ b/.gitignore @@ -67,8 +67,6 @@ core/test/run-bitmap core/test/run-buddy core/test/run-flash-subpartition core/test/*-gcov -debian-jessie-vmlinux -debian-jessie-initrd.gz external/dump_trace external/mambo/skiboot-boot_test.dump external/mambo/skiboot-hello_world.dump diff --git a/opal-ci/build-ubuntu-16.04.sh b/opal-ci/build-ubuntu-16.04.sh index 06a9b48..39fb3f1 100755 --- a/opal-ci/build-ubuntu-16.04.sh +++ b/opal-ci/build-ubuntu-16.04.sh @@ -11,7 +11,6 @@ export CROSS="ccache powerpc64le-linux-gnu-" make -j${MAKE_J} all (cd opal-ci; ./build-qemu-powernv.sh) export QEMU_BIN=$(pwd)/opal-ci/qemu/ppc64-softmmu/qemu-system-ppc64 -./opal-ci/fetch-debian-jessie-installer.sh make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) # because some ppc64le versions don't have arm cross compiler diff --git a/opal-ci/build-ubuntu-18.04.sh b/opal-ci/build-ubuntu-18.04.sh index 2786600..6fd755f 100755 --- a/opal-ci/build-ubuntu-18.04.sh +++ b/opal-ci/build-ubuntu-18.04.sh @@ -9,7 +9,6 @@ MAKE_J=$(grep -c processor /proc/cpuinfo) export CROSS="ccache powerpc64le-linux-gnu-" make -j${MAKE_J} all -./opal-ci/fetch-debian-jessie-installer.sh make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) # because some ppc64le versions don't have arm cross compiler diff --git a/opal-ci/build-ubuntu-latest.sh b/opal-ci/build-ubuntu-latest.sh index 1b79b46..16c33a9 100755 --- a/opal-ci/build-ubuntu-latest.sh +++ b/opal-ci/build-ubuntu-latest.sh @@ -9,7 +9,6 @@ MAKE_J=$(nproc) export CROSS="ccache powerpc64le-linux-gnu-" make -j${MAKE_J} all -./opal-ci/fetch-debian-jessie-installer.sh make -j${MAKE_J} check (make clean; cd external/gard && CROSS= make -j${MAKE_J}) ( cd external/pflash; diff --git a/opal-ci/fetch-debian-jessie-installer.sh b/opal-ci/fetch-debian-jessie-installer.sh deleted file mode 100755 index 5447313..0000000 --- a/opal-ci/fetch-debian-jessie-installer.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -curl -L http://ftp.debian.org/debian/dists/jessie/main/installer-ppc64el/current/images/netboot/debian-installer/ppc64el/vmlinux -o debian-jessie-vmlinux -curl -L http://ftp.debian.org/debian/dists/jessie/main/installer-ppc64el/current/images/netboot/debian-installer/ppc64el/initrd.gz -o debian-jessie-initrd.gz diff --git a/test/Makefile.check b/test/Makefile.check index db286ac..c213725 100644 --- a/test/Makefile.check +++ b/test/Makefile.check @@ -1,4 +1,4 @@ -check: boot-check boot-smt-check qemu-boot-check debian-jessie-boot-check +check: boot-check boot-smt-check qemu-boot-check boot-check: skiboot.lid $(call Q, BOOT TEST , ./test/run_mambo_boot_test.sh, $@) @@ -9,9 +9,6 @@ boot-smt-check: skiboot.lid qemu-boot-check: skiboot.lid $(call Q, BOOT TEST , ./test/run_qemu_boot_test.sh , $@) -debian-jessie-boot-check: skiboot.lid - $(call Q, BOOT TEST , ./test/run_qemu-jessie-debian-installer_boot_test.sh, $@) - OP_BUILD_BOOT_CHECK=op-build-v1.0 op-build-v1.1 op-build-v1.2 op-build-v1.2.1 boot-check-%: skiboot.lid skiboot.map diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh deleted file mode 100755 index eb9c1a8..0000000 --- a/test/run_qemu-jessie-debian-installer_boot_test.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -QEMU_ARGS="-m 2G -M powernv -nographic -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0" - -if [ -z "$QEMU_BIN" ]; then - QEMU_BIN="qemu-system-ppc64" -fi - -if [ ! $(command -v $QEMU_BIN) ]; then - echo "Could not find executable QEMU_BIN ($QEMU_BIN). Skipping hello_world test"; - exit 0; -fi - -if [ -n "$KERNEL" ]; then - echo 'Please rebuild skiboot without KERNEL set. Skipping boot test'; - exit 0; -fi - -if [ ! $(command -v expect) ]; then - echo 'Could not find expect binary. Skipping boot test'; - exit 0; -fi - -if [ ! -f debian-jessie-vmlinux ]; then - echo 'No debian-jessie-vmlinux kernel! Run opal-ci/fetch-debian-jessie-installer.sh : Skipping test.'; - exit 0; -fi - -if [ ! -f debian-jessie-initrd.gz ]; then - echo 'No debian-jessie-initrd.gz! Run opal-ci/fetch-debian-jessie-installer.sh : Skipping test'; - exit 0; -fi - -T=$(mktemp --tmpdir skiboot_qemu_debian-jessie-boot_test.XXXXXXXXXX) -#D=$(mktemp --tmpdir debian-jessie-install.qcow2.XXXXXXXXXX) - -# In future we should do full install: -# FIXME: -append "DEBIAN_FRONTEND=text locale=en_US keymap=us hostname=OPALtest domain=unassigned-domain rescue/enable=true" -# qemu-img create -f qcow2 $D 128G 2>&1 > $T - -( cat <&1 >> $T -E=$? - -if [ $E -eq 3 ]; then - echo "WARNING: Qemu test not run; upgrade QEMU to one that supports PCR register"; - rm $T $D - exit 0; -fi - -if [ $E -eq 0 ]; then - rm $T $D -else - cat $T - echo "Boot Test FAILED. Results in $T, Disk $D"; -fi - -exit $E; -- cgit v1.1