travis: Don't duplicate Docker invocation

All variable parts are taken from the environment, so we
can exploit inheritance and avoid duplication. This will
become more important as we start building on additional
platforms.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/.travis.yml b/.travis.yml
index f99e1cd6e6b1e9448648ca9f8e523d1943a03731..4afaca313b3d4d5701ab3742063ff1b5ff3d3ab5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,31 +12,11 @@ matrix:
       env:
         - IMAGE=ubuntu:18.04
         - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd"
-      script:
-        - docker run
-            --privileged
-            -v $(pwd):/build
-            -w /build
-            -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG"
-            -e PACKAGES="$PACKAGES"
-            -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS"
-            "$IMAGE"
-            /bin/sh -xc "$DOCKER_CMD"
     - services:
         - docker
       env:
         - IMAGE=ubuntu:16.04
         - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart"
-      script:
-        - docker run
-            --privileged
-            -v $(pwd):/build
-            -w /build
-            -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG"
-            -e PACKAGES="$PACKAGES"
-            -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS"
-            "$IMAGE"
-            /bin/sh -xc "$DOCKER_CMD"
     - compiler: clang
       language: c
       os: osx
@@ -57,6 +37,17 @@ matrix:
         - find -name test-suite.log | xargs cat
         - echo '=== LOG FILE(S) END ==='
 
+script:
+  - docker run
+      --privileged
+      -v $(pwd):/build
+      -w /build
+      -e VIR_TEST_DEBUG="$VIR_TEST_DEBUG"
+      -e PACKAGES="$PACKAGES"
+      -e DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS"
+      "$IMAGE"
+      /bin/sh -xc "$DOCKER_CMD"
+
 git:
   submodules: true