| Message ID | 20200206202543.7085-1-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | travis.yml: Test the s390-ccw build, too | expand |
On 2/6/20 9:25 PM, Thomas Huth wrote: > Since we can now use a s390x host on Travis, we can also build and > test the s390-ccw bios images there. For this we have to make sure > that roms/SLOF is checked out, too, and then move the generated *.img > files to the right location before running the tests. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > .travis.yml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/.travis.yml b/.travis.yml > index 6c0ec6cf69..c0eeff9caa 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -508,6 +508,16 @@ matrix: > env: > - TEST_CMD="make check check-tcg V=1" > - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" > + script: > + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) > + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? > + - | > + if [ "$BUILD_RC" -eq 0 ] ; then > + mv pc-bios/s390-ccw/*.img pc-bios/ ; > + ${TEST_CMD} ; > + else > + $(exit $BUILD_RC); > + fi > > # Release builds > # The make-release script expect a QEMU version, so our tag must start with a 'v'. > Maybe remove the trailing ", too" in subject... Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> https://travis-ci.org/philmd/qemu/jobs/647085877#L3190
On Thu, 6 Feb 2020 21:25:43 +0100 Thomas Huth <thuth@redhat.com> wrote: > Since we can now use a s390x host on Travis, we can also build and > test the s390-ccw bios images there. For this we have to make sure > that roms/SLOF is checked out, too, and then move the generated *.img > files to the right location before running the tests. Oh, nice. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > .travis.yml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/.travis.yml b/.travis.yml > index 6c0ec6cf69..c0eeff9caa 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -508,6 +508,16 @@ matrix: > env: > - TEST_CMD="make check check-tcg V=1" > - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" > + script: > + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) > + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? > + - | > + if [ "$BUILD_RC" -eq 0 ] ; then > + mv pc-bios/s390-ccw/*.img pc-bios/ ; > + ${TEST_CMD} ; Out of curiousity: Which kind of tests are run for the net image? > + else > + $(exit $BUILD_RC); > + fi > > # Release builds > # The make-release script expect a QEMU version, so our tag must start with a 'v'. Acked-by: Cornelia Huck <cohuck@redhat.com>
On 07/02/2020 10.47, Cornelia Huck wrote: > On Thu, 6 Feb 2020 21:25:43 +0100 > Thomas Huth <thuth@redhat.com> wrote: > >> Since we can now use a s390x host on Travis, we can also build and >> test the s390-ccw bios images there. For this we have to make sure >> that roms/SLOF is checked out, too, and then move the generated *.img >> files to the right location before running the tests. > > Oh, nice. > >> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> .travis.yml | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/.travis.yml b/.travis.yml >> index 6c0ec6cf69..c0eeff9caa 100644 >> --- a/.travis.yml >> +++ b/.travis.yml >> @@ -508,6 +508,16 @@ matrix: >> env: >> - TEST_CMD="make check check-tcg V=1" >> - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" >> + script: >> + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) >> + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? >> + - | >> + if [ "$BUILD_RC" -eq 0 ] ; then >> + mv pc-bios/s390-ccw/*.img pc-bios/ ; >> + ${TEST_CMD} ; > > Out of curiousity: Which kind of tests are run for the net image? The tests/qtest/pxe-test.c test exercises the netboot. (and tests/qtest/cdrom-test.c execises booting from disk) We could maybe add also add more complex test in "check-acceptance" later, but that's something for another day... Thomas
On 07.02.20 10:56, Thomas Huth wrote: > On 07/02/2020 10.47, Cornelia Huck wrote: >> On Thu, 6 Feb 2020 21:25:43 +0100 >> Thomas Huth <thuth@redhat.com> wrote: >> >>> Since we can now use a s390x host on Travis, we can also build and >>> test the s390-ccw bios images there. For this we have to make sure >>> that roms/SLOF is checked out, too, and then move the generated *.img >>> files to the right location before running the tests. >> >> Oh, nice. Yes, very cool.
Thomas Huth <thuth@redhat.com> writes: > Since we can now use a s390x host on Travis, we can also build and > test the s390-ccw bios images there. For this we have to make sure > that roms/SLOF is checked out, too, and then move the generated *.img > files to the right location before running the tests. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Queued to testing/next, thanks. > --- > .travis.yml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/.travis.yml b/.travis.yml > index 6c0ec6cf69..c0eeff9caa 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -508,6 +508,16 @@ matrix: > env: > - TEST_CMD="make check check-tcg V=1" > - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" > + script: > + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) > + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? > + - | > + if [ "$BUILD_RC" -eq 0 ] ; then > + mv pc-bios/s390-ccw/*.img pc-bios/ ; > + ${TEST_CMD} ; > + else > + $(exit $BUILD_RC); > + fi > > # Release builds > # The make-release script expect a QEMU version, so our tag must start with a 'v'.
diff --git a/.travis.yml b/.travis.yml index 6c0ec6cf69..c0eeff9caa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -508,6 +508,16 @@ matrix: env: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" + script: + - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) + - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? + - | + if [ "$BUILD_RC" -eq 0 ] ; then + mv pc-bios/s390-ccw/*.img pc-bios/ ; + ${TEST_CMD} ; + else + $(exit $BUILD_RC); + fi # Release builds # The make-release script expect a QEMU version, so our tag must start with a 'v'.
Since we can now use a s390x host on Travis, we can also build and test the s390-ccw bios images there. For this we have to make sure that roms/SLOF is checked out, too, and then move the generated *.img files to the right location before running the tests. Signed-off-by: Thomas Huth <thuth@redhat.com> --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+)