[PATCH v2 2/2] travis: convert ubuntu, centos & mingw builds to use new make rules

[Daniel P. Berrangé <berrange@xxxxxxxxxx>]

Change the travis configuration to invoke the new cibuild-$IMAGE target
instead of directly running docker. This guarantees that when a
developer runs cibuild-$IMAGE locally, the container build setup is
identical to that used in Travis, with exception of the host kernel
and docker version.

Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
 .travis.yml | 48 ++++++++++--------------------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55ba340a34..c093dbf550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,26 +11,30 @@ matrix:
         - docker
       env:
         - IMAGE="ubuntu-18"
-        - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd"
-        - DOCKER_CMD="$LINUX_CMD"
+        - MAKE_ARGS="syntax-check distcheck DISTCHECK_CONFIGURE_FLAGS=--with-init-script-systemd"
+      script:
+        - make -f tests/Makefile.ci.inc cibuild-$IMAGE  MAKE_ARGS="$MAKE_ARGS"
     - services:
         - docker
       env:
         - IMAGE="centos-7"
-        - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart"
-        - DOCKER_CMD="$LINUX_CMD"
+        - MAKE_ARGS="syntax-check distcheck DISTCHECK_CONFIGURE_FLAGS=--with-init-script-systemd"
+      script:
+        - make -f tests/Makefile.ci.inc cibuild-$IMAGE  MAKE_ARGS="$MAKE_ARGS"
     - services:
         - docker
       env:
         - IMAGE="fedora-rawhide"
         - MINGW="mingw32"
-        - DOCKER_CMD="$MINGW_CMD"
+      script:
+        - make -f tests/Makefile.ci.inc cibuild-$IMAGE CONFIGURE=$MINGW-configure MAKE_ARGS="$MAKE_ARGS"
     - services:
         - docker
       env:
         - IMAGE="fedora-rawhide"
         - MINGW="mingw64"
-        - DOCKER_CMD="$MINGW_CMD"
+      script:
+        - make -f tests/Makefile.ci.inc cibuild-$IMAGE CONFIGURE=$MINGW-configure MAKE_ARGS="$MAKE_ARGS"
     - compiler: clang
       language: c
       os: osx
@@ -39,44 +43,12 @@ matrix:
       script:
         /bin/sh -xc "$MACOS_CMD"
 
-script:
-  - docker run
-      -v $(pwd):/build
-      -w /build
-      -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG"
-      -e MINGW="$MINGW"
-      -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS"
-      "quay.io/libvirt/buildenv-$IMAGE:master"
-      /bin/sh -xc "$DOCKER_CMD"
-
 git:
   submodules: true
 
 env:
   global:
     - VIR_TEST_DEBUG=1
-    - LINUX_CMD="
-        ./autogen.sh &&
-        make -j3 syntax-check &&
-        make -j3 distcheck DISTCHECK_CONFIGURE_FLAGS=\"\$DISTCHECK_CONFIGURE_FLAGS\" ||
-        (
-          echo '=== LOG FILE(S) START ===';
-          find -name test-suite.log | xargs cat;
-          echo '=== LOG FILE(S) END ===';
-          exit 1
-        )
-      "
-    - MINGW_CMD="
-        NOCONFIGURE=1 ./autogen.sh &&
-        \$MINGW-configure &&
-        make -j3 ||
-        (
-          echo '=== LOG FILE(S) START ===';
-          find -name test-suite.log | xargs cat;
-          echo '=== LOG FILE(S) END ===';
-          exit 1
-        )
-      "
     # We can't run 'distcheck' or 'syntax-check' because they fail on
     # macOS, but doing 'install' and 'dist' gives us some useful coverage
     - MACOS_CMD="
-- 
2.20.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list