From 01f9d0d9bf47f80823094de6b184ee67023406c7 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Thu, 16 Aug 2018 09:26:35 +0200

Subject: [PATCH] travis: combine more tests

---

 .travis.yml | 14 +++++---------

 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml

index f2cd8b26..a99418e3 100644

--- a/.travis.yml

+++ b/.travis.yml

@@ -5,21 +5,17 @@ services:

 env:

   matrix:

   - IMAGE=latest TESTS=01

-  - IMAGE=latest TESTS="02 03 04"

-  - IMAGE=latest TESTS="10 11 12 13 15 17 18"

+  - IMAGE=latest TESTS="02 03 04 10 11 12 13 15 17 18"

   - IMAGE=latest TESTS=20

-  - IMAGE=latest TESTS=30

-  - IMAGE=latest TESTS=31

+  - IMAGE=latest TESTS="30 31"

   - IMAGE=latest TESTS=40

   - IMAGE=latest TESTS=50

   - IMAGE=latest TESTS=70

   - IMAGE=latest TESTS=99

   - IMAGE=rawhide TESTS=01

-  - IMAGE=rawhide TESTS="02 03 04"

-  - IMAGE=rawhide TESTS="10 11 12 13 15 17 18"

+  - IMAGE=rawhide TESTS="02 03 04 10 11 12 13 15 17 18"

   - IMAGE=rawhide TESTS=20

-  - IMAGE=rawhide TESTS=30

-  - IMAGE=rawhide TESTS=31

+  - IMAGE=rawhide TESTS="30 31"

   - IMAGE=rawhide TESTS=40

   - IMAGE=rawhide TESTS=50

   - IMAGE=rawhide TESTS=70

@@ -28,7 +24,7 @@ env:

 before_script:

 - docker pull fedora:$IMAGE

 script:

-- docker run --privileged -it -v $(pwd)/:/dracut fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$ $TESTS

+- docker run --privileged -it -v $(pwd)/:/dracut fedora:$IMAGE /dracut/fedora-test.sh $IMAGE-$$ "$TESTS"

 notifications:

   webhooks:

     urls: