From 60de8eff9d6fd5c029fdc37156c330bdec468304 Mon Sep 17 00:00:00 2001
From: huguenindo <dominique.huguenin@rpn.ch>
Date: Wed, 24 Aug 2022 16:43:28 +0200
Subject: [PATCH 1/2] refactor: utilisation des templates du projet ci-template

---
 .gitlab-ci.yml | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bacfb18..9ff4628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,35 @@
-include:  
-- project: 'dhu.projets/ci-templates'
-  ref: master
-  file: 'maven-build.yml'  
-- project: 'dhu.projets/ci-templates'
-  ref: master
-  file: 'maven-release.yml'  
+include:
+  - project: 'dhu.projets/ci-include'
+    ref: v1.0.3
+    file: 'ci-verify-deploy-release.yml'
 
-services:
-  - postgres:12.2-alpine
+default:
+  before_script: 
+    - |
+      sudo -u postgres psql << EOF
+      CREATE ROLE ${TEST_DB_USER} WITH login PASSWORD $(echo "'"${TEST_DB_PASSWORD}"'");
+      CREATE DATABASE "${TEST_DB_NAME}" OWNER ${TEST_DB_USER};
+      \l
+      EOF
 
-variables:
-  POSTGRES_DB: campanuleTestDB
-  POSTGRES_USER: campanule
-  POSTGRES_PASSWORD: campanulepass
-  POSTGRES_HOST_AUTH_METHOD: trust  
+    - sudo echo "127.0.1.2 ${TEST_DB_HOST}" >> /etc/hosts
+    - cat /etc/hosts
+
+    - |
+      PGPASSWORD="${TEST_DB_PASSWORD}" psql -h ${TEST_DB_HOST} -p ${TEST_DB_PORT} -U "${TEST_DB_USER}" "${TEST_DB_NAME}" << EOF
+      \d
+      EOF
+
+#    - |
+#      export DATABASE_HOST=${TEST_DB_HOST}
+#      export DATABASE_PORT=${TEST_DB_PORT}
+#      export DATABASE_NAME=${TEST_DB_NAME}
+#      export DATABASE_USER=${TEST_DB_USER}
+#      export DATABASE_PASSWORD=${TEST_DB_PASSWORD}  
+#      
+#    - |
+#      pwd
+#      ls
+#      cd SQL
+#      bash ./createSchema.sh
+#      cd -
-- 
GitLab


From 31318176ee7f1a2fdf28c9fcf78ca531eb1eee4a Mon Sep 17 00:00:00 2001
From: huguenindo <dominique.huguenin@rpn.ch>
Date: Wed, 24 Aug 2022 16:49:11 +0200
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20suppression=20du=20code=20comment?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ff4628..9d3d715 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,17 +19,3 @@ default:
       PGPASSWORD="${TEST_DB_PASSWORD}" psql -h ${TEST_DB_HOST} -p ${TEST_DB_PORT} -U "${TEST_DB_USER}" "${TEST_DB_NAME}" << EOF
       \d
       EOF
-
-#    - |
-#      export DATABASE_HOST=${TEST_DB_HOST}
-#      export DATABASE_PORT=${TEST_DB_PORT}
-#      export DATABASE_NAME=${TEST_DB_NAME}
-#      export DATABASE_USER=${TEST_DB_USER}
-#      export DATABASE_PASSWORD=${TEST_DB_PASSWORD}  
-#      
-#    - |
-#      pwd
-#      ls
-#      cd SQL
-#      bash ./createSchema.sh
-#      cd -
-- 
GitLab