From 1ebbe2eb7b177f169e48df6318d9169e9ae1afe9 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Thu, 16 Aug 2018 09:10:29 +0200

Subject: [PATCH] travis: combine jobs

---

 .travis.yml | 64 +++++++++++++++++++++----------------------------------------

 1 file changed, 22 insertions(+), 42 deletions(-)

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

index fbaafdac..f2cd8b26 100644

--- a/.travis.yml

+++ b/.travis.yml

@@ -1,49 +1,29 @@

 language: generic

 sudo: required

 services:

-  - docker

+- docker

 env:

   matrix:

-    - IMAGE=latest TESTS=01

-    - IMAGE=latest TESTS=02

-    - IMAGE=latest TESTS=03

-    - IMAGE=latest TESTS=04

-    - IMAGE=latest TESTS=10

-    - IMAGE=latest TESTS=11

-    - IMAGE=latest TESTS=12

-    - IMAGE=latest TESTS=13

-    - IMAGE=latest TESTS=14

-    - IMAGE=latest TESTS=15

-    - IMAGE=latest TESTS=16

-    - IMAGE=latest TESTS=17

-    - IMAGE=latest TESTS=18

-    - IMAGE=latest TESTS=20

-    - IMAGE=latest TESTS=30

-    - IMAGE=latest TESTS=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

-    - IMAGE=rawhide TESTS=03

-    - IMAGE=rawhide TESTS=04

-    - IMAGE=rawhide TESTS=10

-    - IMAGE=rawhide TESTS=11

-    - IMAGE=rawhide TESTS=12

-    - IMAGE=rawhide TESTS=13

-    - IMAGE=rawhide TESTS=14

-    - IMAGE=rawhide TESTS=15

-    - IMAGE=rawhide TESTS=16

-    - IMAGE=rawhide TESTS=17

-    - IMAGE=rawhide TESTS=18

-    - IMAGE=rawhide TESTS=20

-    - IMAGE=rawhide TESTS=30

-    - IMAGE=rawhide TESTS=31

-    - IMAGE=rawhide TESTS=40

-    - IMAGE=rawhide TESTS=50

-    - IMAGE=rawhide TESTS=70

-    - IMAGE=rawhide TESTS=99

+  - IMAGE=latest TESTS=01

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

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

+  - IMAGE=latest TESTS=20

+  - IMAGE=latest TESTS=30

+  - IMAGE=latest TESTS=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=20

+  - IMAGE=rawhide TESTS=30

+  - IMAGE=rawhide TESTS=31

+  - IMAGE=rawhide TESTS=40

+  - IMAGE=rawhide TESTS=50

+  - IMAGE=rawhide TESTS=70

+  - IMAGE=rawhide TESTS=99

 before_script:

 - docker pull fedora:$IMAGE

@@ -52,7 +32,7 @@ script:

 notifications:

   webhooks:

     urls:

-      - https://webhooks.gitter.im/e/effa917ca3e0ed5fd00e

+    - https://webhooks.gitter.im/e/effa917ca3e0ed5fd00e

     on_success: change  # options: [always|never|change] default: always

     on_failure: always  # options: [always|never|change] default: always

     on_start: never     # options: [always|never|change] default: always