From 96bbc27a395e6b0791c892370995276f45bb8df5 Mon Sep 17 00:00:00 2001
From: Alicja Reniewicz <areniewicz@7bulls.com>
Date: Tue, 17 Mar 2020 15:18:09 +0100
Subject: [PATCH 1/2] add gitlab-ci.yml file with tags for docker images

---
 .gitlab-ci.yml | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..3ce2404
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,99 @@
+# Gitlab CI/CD script for the Melodic Integration project
+# 
+# Notes:
+#  
+
+variables:
+  DOCKER_PUSH: "true"
+  DOCKER_REPO: "gitlab.ow2.org:4567"
+  MAVEN_IMAGE: "maven:3.5.2-jdk-8"
+  DOCKER_DIND_IMAGE: "docker:19.03.1"
+  DOCKER_DIND_SERVICE: "$DOCKER_DIND_IMAGE-dind"
+  
+  LOCAL_REPO: "127.0.0.1:5000"
+
+  DOCKER_CLI: "docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $CI_PROJECT_DIR/maven_repo:/root/.m2 -w /usr/src/mymaven -v $CI_PROJECT_DIR:/usr/src/mymaven $MAVEN_IMAGE"
+  RAML_TO_JAXRS_CLI: "mvn -DskipTests --batch-mode -f raml-to-jaxrs-7bulls/pom.xml"
+  INTERFACES_CLI: "mvn -DskipTests --batch-mode -f interfaces/pom.xml"
+  #MULE_ESB_CLI: "mvn -DskipTests -Ddocker.repository=$DOCKER_REPO -Ddocker.push=$DOCKER_PUSH -Ddocker.imagePrefix=melodic/ --batch-mode -f mule_esb/pom.xml"
+  #PROCESS_CLI: "mvn -DskipTests -Ddocker.repository=$DOCKER_REPO -Ddocker.push=$DOCKER_PUSH -Ddocker.imagePrefix=melodic/ --batch-mode -f process/pom.xml"
+  MULE_ESB_CLI: "mvn -DskipTests --batch-mode -f mule_esb/pom.xml"
+  PROCESS_CLI: "mvn -DskipTests --batch-mode -f process/pom.xml"
+  DOCKER_DRIVER: overlay
+  DOCKER_TLS_CERTDIR: "/certs"
+  
+cache:
+  paths:
+    - maven_repo/
+
+before_script:
+  - echo '=========================================================================='
+  - echo $MULE_ESB_CLI
+  - echo '=========================================================================='
+  - mkdir -p $HOME/.m2
+  - echo '<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                            https://maven.apache.org/xsd/settings-1.0.0.xsd">
+                <localRepository>'$CI_PROJECT_DIR'/maven_repo</localRepository>
+          </settings>' > $HOME/.m2/settings.xml
+
+after_script:
+  - echo '=========================================================================='
+  - docker image ls
+  - echo '=========================================================================='
+
+
+build:raml_to_jaxrs:
+  stage: build
+  image: $MAVEN_IMAGE
+  script:
+    - $RAML_TO_JAXRS_CLI clean install
+
+build:interfaces:
+  stage: build
+  image: $MAVEN_IMAGE
+  script:    
+    - $INTERFACES_CLI clean install
+
+deploy:raml_to_jaxrs:
+  stage: deploy
+  image: $MAVEN_IMAGE
+  script:
+    - $RAML_TO_JAXRS_CLI deploy
+  only:
+    - $CI_COMMIT_BRANCH
+
+deploy:interfaces:
+  stage: deploy
+  image: $MAVEN_IMAGE
+  script:    
+    - $INTERFACES_CLI deploy
+  only:
+    - $CI_COMMIT_BRANCH
+
+deploy:mule_esb:
+  stage: deploy
+  image: $DOCKER_DIND_IMAGE
+  services:
+    - $DOCKER_DIND_SERVICE
+  script:
+    - $DOCKER_CLI $MULE_ESB_CLI -Ddocker.imagePrefix=melodic/ clean install
+    - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin 
+    - docker tag $LOCAL_REPO/melodic/mule $DOCKER_REPO/melodic/melodic-integration/mule:$CI_COMMIT_BRANCH
+    - docker push $DOCKER_REPO/melodic/melodic-integration/mule:$CI_COMMIT_BRANCH
+  only:
+    - $CI_COMMIT_BRANCH
+
+deploy:process:
+  stage: deploy
+  image: $DOCKER_DIND_IMAGE
+  services:
+    - $DOCKER_DIND_SERVICE
+  script:    
+    - $DOCKER_CLI $PROCESS_CLI -Ddocker.imagePrefix=melodic/ clean install
+    - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin 
+    - docker tag $LOCAL_REPO/melodic/process $DOCKER_REPO/melodic/melodic-integration/process:$CI_COMMIT_BRANCH
+    - docker push $DOCKER_REPO/melodic/melodic-integration/process:$CI_COMMIT_BRANCH
+  only:
+    - $CI_COMMIT_BRANCH
-- 
GitLab


From 5d51195bef9265f88ef13b0940570dda440ee431 Mon Sep 17 00:00:00 2001
From: Alicja Reniewicz <areniewicz@7bulls.com>
Date: Tue, 17 Mar 2020 16:00:02 +0100
Subject: [PATCH 2/2] delete 'only' sections

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ce2404..6b312e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,16 +61,12 @@ deploy:raml_to_jaxrs:
   image: $MAVEN_IMAGE
   script:
     - $RAML_TO_JAXRS_CLI deploy
-  only:
-    - $CI_COMMIT_BRANCH
 
 deploy:interfaces:
   stage: deploy
   image: $MAVEN_IMAGE
   script:    
     - $INTERFACES_CLI deploy
-  only:
-    - $CI_COMMIT_BRANCH
 
 deploy:mule_esb:
   stage: deploy
@@ -82,8 +78,6 @@ deploy:mule_esb:
     - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin 
     - docker tag $LOCAL_REPO/melodic/mule $DOCKER_REPO/melodic/melodic-integration/mule:$CI_COMMIT_BRANCH
     - docker push $DOCKER_REPO/melodic/melodic-integration/mule:$CI_COMMIT_BRANCH
-  only:
-    - $CI_COMMIT_BRANCH
 
 deploy:process:
   stage: deploy
@@ -95,5 +89,3 @@ deploy:process:
     - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $DOCKER_REPO -u $K8S_SECRET_DOCKER_USER --password-stdin 
     - docker tag $LOCAL_REPO/melodic/process $DOCKER_REPO/melodic/melodic-integration/process:$CI_COMMIT_BRANCH
     - docker push $DOCKER_REPO/melodic/melodic-integration/process:$CI_COMMIT_BRANCH
-  only:
-    - $CI_COMMIT_BRANCH
-- 
GitLab