From 7d81b70b9f7533a99a5c067136e9f4d0d1dc581a Mon Sep 17 00:00:00 2001
From: ssube <seansube@gmail.com>
Date: Tue, 17 Dec 2019 10:07:19 -0600
Subject: [PATCH] feat(build): add pgtap job for pg11

---
 .gitlab-ci.yml    | 28 ++++++++++++++++++----------
 .gitlab/tools.yml | 10 +++++++++-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ecdd8df..2288a13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,23 +56,31 @@ build-image-postgres-11-tag:
     IMAGE_ARGS: --push
     IMAGE_ARCH: postgres-11
 
-test-schema-postgres-10:
-  extends:
-    - .test-pgtap
-  stage:
+.test-schema:
+  stage: test
   script:
+    - export PGHOST=localhost
+    - export PGPASSWORD=test_root
+    - export PGDATABASE=test_schema
+    - 
+      psql -c "SELECT 'ok';" || sleep 3600
     - ./scripts/schema-create.sh
     - cpan TAP::Parser::SourceHandler::pgTAP
     - pg_prove test/*.sql
   variables:
-    PGHOST: localhost
-    PGPORT: 5432
-    PGUSER: test_root
-    PGPASSWORD: test_root
-    PGDATABASE: test_schema
     POSTGRES_DATABASE: test_schema
-    POSTGRES_USER: test_root
     POSTGRES_PASSWORD: test_root
+
+test-schema-postgres-10:
+  extends:
+    - .test-pgtap-10
+    - .test-schema
+
+test-schema-postgres-11:
+  extends:
+    - .test-pgtap-11
+    - .test-schema
+
 # github jobs
 github-pending:
   stage: status-pre
diff --git a/.gitlab/tools.yml b/.gitlab/tools.yml
index 631d8db..452871d 100644
--- a/.gitlab/tools.yml
+++ b/.gitlab/tools.yml
@@ -60,7 +60,7 @@
     - runner:shared
   allow_failure: false
 
-.test-pgtap:
+.test-pgtap-10:
   image: ssube/prometheus-sql-adapter:master-postgres-10
   services:
     - docker.artifacts.apextoaster.com/ssube/timescaledb:1.5.1-pg10-pgtap
@@ -68,3 +68,11 @@
     - platform:k8s
     - runner:shared
 
+.test-pgtap-11:
+  image: ssube/prometheus-sql-adapter:master-postgres-11
+  services:
+    - docker.artifacts.apextoaster.com/ssube/timescaledb:1.5.1-pg11-pgtap
+  tags:
+    - platform:k8s
+    - runner:shared
+