ISSUE-143 (paunin#155)

zhangqidong · May 26, 2018 · d5fa120 · d5fa120
1 parent 7ff0ea0
commit d5fa120
Show file tree

Hide file tree

Showing 73 changed files with 5,423 additions and 232 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Mon  9 Apr 2018 21:51:20 +07              ##
+##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
 ##########################################################################
 
 sudo: required
@@ -11,57 +11,111 @@ services:
 
 jobs:
   include:
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.6_pgpool-3.7_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = 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:
         - NAME = 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:
+        - NAME = postgres-9.6_pgpool-3.7_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.6_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.6_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-9.6_pgpool-3.6_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.6_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.3_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-9.6_pgpool-3.3_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.6_pgpool-3.3_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.7_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-9.5_pgpool-3.7_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.5_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.6_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-9.5_pgpool-3.6_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.5_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.3_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-9.5_pgpool-3.3_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.5_pgpool-3.3_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.7_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-10_pgpool-3.7_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-10_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.6_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-10_pgpool-3.6_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-10_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.3_barman-2.4 ./tests/run.sh
+      env:
+        - NAME = postgres-10_pgpool-3.3_barman-2.4
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-10_pgpool-3.3_barman-2.3

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ Taking into account that PostDock project itself has versioning schema, all dock
 * `<component>`, `<component_version>` - depends on component:
     * `postgres`,`postgres-extended` - major and minor version without dot in between(can be `95`,`96`,`10`)
     * `pgpool` - major and minor version of component without dot in between(can be `33`,`36`,`37`)
-    * `barman` - major version only (can be `2`)
+    * `barman` - major version only (can be `23`,`24`)
 * `<sub_component>`, `<sub_component_version>` - depends on component:
     * for `postgres` - `repmgr` can be `3.2`
     * for `barman` - `postgres` can be `9.6`, `10`

diff --git a/docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml b/docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml
@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Mon  9 Apr 2018 21:51:20 +07              ##
+##               BUILD_NUMBER=Fri May 25 12:36:46 +07 2018              ##
 ##########################################################################
 
 version: '2'