updated build

schmunk42 · Jan 19, 2017 · 45e4c90 · 45e4c90
1 parent d54da7a
commit 45e4c90
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -42,7 +42,18 @@ test:db:
     - docker-compose up -d
     # wait for mysql (retry 30 times)
     - docker-compose run --rm php bash -c "while ! curl mysql:3306; do ((c++)) && ((c==30)) && break; sleep 1; done"
-    - docker-compose run --rm php vendor/bin/phpunit -v --group db --exclude mssql,cubrid
+    - docker-compose run --rm php vendor/bin/phpunit -v --group db --exclude mssql,cubrid,pgsql
+    - docker-compose down -v
+
+
+test:db:pgsql:
+  stage: test
+  script:
+    - export COMPOSE_PROJECT_NAME=${ISOLATION}pgsql
+    - docker-compose up -d
+    # wait for mysql (retry 30 times)
+    - docker-compose run --rm php bash -c "while ! curl postgres:5432; do ((c++)) && ((c==30)) && break; sleep 1; done"
+    - docker-compose run --rm php vendor/bin/phpunit -v --group db --group pgsql
     - docker-compose down -v
 
 
@@ -62,7 +73,7 @@ test:db:cubrid:
   stage: test
   script:
     - cd cubrid
-    - export COMPOSE_PROJECT_NAME=${ISOLATION}caching
+    - export COMPOSE_PROJECT_NAME=${ISOLATION}cubrid
     # TODO: retry/wait for db
     - docker-compose up --build -d && sleep 10
     - docker-compose run --rm php /project/vendor/bin/phpunit -v --group cubrid
@@ -73,6 +84,7 @@ test:travis:
   only:
     - travis
   script:
+    - export COMPOSE_PROJECT_NAME=${ISOLATION}travis
     - docker-compose up -d
     # TODO: retry/wait for db
     - sleep 10
@@ -88,6 +100,10 @@ cleanup:
     - docker-compose down -v
     - export COMPOSE_PROJECT_NAME=${ISOLATION}db
     - docker-compose down -v
+    - export COMPOSE_PROJECT_NAME=${ISOLATION}pgsql
+    - docker-compose down -v
+    - export COMPOSE_PROJECT_NAME=${ISOLATION}travis
+    - docker-compose down -v
     - export COMPOSE_PROJECT_NAME=${ISOLATION}mssql
     - docker-compose down -v
     - export COMPOSE_PROJECT_NAME=${ISOLATION}cubrid