Drop extended postgres in regular tests

Author: paunin

.travis.yml

@@ -1,68 +1,14 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Jun  1 13:38:15 +07 2018              ##
+##               BUILD_NUMBER=Sat  2 Jun 2018 13:40:46 +07              ##
 ##########################################################################
 
 sudo: required
 services:
   - docker
 jobs:
   include:
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.7_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.6_pgpool-3.7_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.7_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.6_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.6_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.6_pgpool-3.6_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.6_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.6_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.3_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.6_pgpool-3.3_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.3_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.6_pgpool-3.3_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.7_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.5_pgpool-3.7_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.7_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.5_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.6_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.5_pgpool-3.6_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.6_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.5_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.3_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.5_pgpool-3.3_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.3_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-9.5_pgpool-3.3_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.7_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-10_pgpool-3.7_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.7_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-10_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.6_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-10_pgpool-3.6_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.6_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-10_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.3_barman-2.4 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-10_pgpool-3.3_barman-2.4
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.3_barman-2.3 ./tests/run.sh
-      env:
-        - COMBINATION=postgres-extended-10_pgpool-3.3_barman-2.3
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.7_barman-2.4 ./tests/run.sh
       env:
         - COMBINATION=postgres-9.6_pgpool-3.7_barman-2.4

make/travis/make.sh

@@ -6,5 +6,5 @@ FILE_TO=".travis.yml"
 
 template $FILE_HEADER $FILE_TO
 
-export TEST_COMBINATIONS=(`ls -r docker-compose | grep '.yml' | xargs -I % basename % '.yml'`)
+export TEST_COMBINATIONS=(`ls -r docker-compose | grep '.yml' | grep -v 'extended' | xargs -I % basename % '.yml'`)
 template $FILE_FROM $FILE_TO