Merge branch 'master' into staging

nimble-platform · Nov 28, 2019 · 56eddab · 56eddab
2 parents 212f94e + 7a9bbe7
commit 56eddab
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 20 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,23 +1,27 @@
 node('nimble-jenkins-slave') {
 
-    stage('Clone and Update') {
-        git(url: 'https://github.com/nimble-platform/data-aggregation-service', branch: env.BRANCH_NAME)
-    }
+    // -----------------------------------------------
+    // --------------- Staging Branch ----------------
+    // -----------------------------------------------
+    if (env.BRANCH_NAME == 'staging') {
 
-    stage('Build Dependencies') {
-        sh 'rm -rf common'
-        sh 'git clone https://github.com/nimble-platform/common'
-        dir('common') {
-            sh 'git checkout ' + env.BRANCH_NAME
-            sh 'mvn clean install'
+        stage('Clone and Update') {
+            git(url: 'https://github.com/nimble-platform/data-aggregation-service', branch: env.BRANCH_NAME)
         }
-    }
 
-    stage('Build Java') {
-        sh 'mvn clean package -DskipTests'
-    }
+        stage('Build Dependencies') {
+            sh 'rm -rf common'
+            sh 'git clone https://github.com/nimble-platform/common'
+            dir('common') {
+                sh 'git checkout ' + env.BRANCH_NAME
+                sh 'mvn clean install'
+            }
+        }
+
+        stage('Build Java') {
+            sh 'mvn clean package -DskipTests'
+        }
 
-    if (env.BRANCH_NAME == 'staging') {
         stage('Build Docker') {
             sh 'mvn -f data-aggregation-service/pom.xml docker:build -DdockerImageTag=staging'
         }
@@ -29,15 +33,73 @@ node('nimble-jenkins-slave') {
         stage('Deploy') {
             sh 'ssh staging "cd /srv/nimble-staging/ && ./run-staging.sh restart-single data-aggregation-service"'
         }
-    } else {
+    }
+
+    // -----------------------------------------------
+    // ---------------- Master Branch ----------------
+    // -----------------------------------------------
+    if (env.BRANCH_NAME == 'master') {
+
+        stage('Clone and Update') {
+            git(url: 'https://github.com/nimble-platform/data-aggregation-service', branch: env.BRANCH_NAME)
+        }
+
+        stage('Build Dependencies') {
+            sh 'rm -rf common'
+            sh 'git clone https://github.com/nimble-platform/common'
+            dir('common') {
+                sh 'git checkout ' + env.BRANCH_NAME
+                sh 'mvn clean install'
+            }
+        }
+
+        stage('Build Java') {
+            sh 'mvn clean package -DskipTests'
+        }
+    }
+
+    // -----------------------------------------------
+    // ---------------- Release Tags -----------------
+    // -----------------------------------------------
+    if( env.TAG_NAME ==~ /^\d+.\d+.\d+$/) {
+
+        stage('Clone and Update') {
+            git(url: 'https://github.com/nimble-platform/data-aggregation-service', branch: 'master')
+        }
+
+        stage('Build Dependencies') {
+            sh 'rm -rf common'
+            sh 'git clone https://github.com/nimble-platform/common'
+            dir('common') {
+                sh 'git checkout master'
+                sh 'mvn clean install'
+            }
+        }
+
+        stage('Set version') {
+            sh 'mvn org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=' + env.TAG_NAME
+            sh 'mvn -f data-aggregation-service/pom.xml org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=' + env.TAG_NAME
+        }
+
+        stage('Build Java') {
+            sh 'mvn clean package -DskipTests'
+        }
+
         stage('Build Docker') {
             sh 'mvn -f data-aggregation-service/pom.xml docker:build'
         }
-    }
 
-    if (env.BRANCH_NAME == 'master') {
-        stage('Deploy') {
+        stage('Push Docker') {
+            sh 'mvn -f data-aggregation-service/pom.xml docker:push -DdockerImageTag=latest'
+            sh 'mvn -f data-aggregation-service/pom.xml docker:push'
+        }
+
+        stage('Deploy MVP') {
             sh 'ssh nimble "cd /data/deployment_setup/prod/ && sudo ./run-prod.sh restart-single data-aggregation-service"'
         }
+
+        stage('Deploy FMP') {
+            sh 'ssh fmp-prod "cd /srv/nimble-fmp/ && ./run-fmp-prod.sh restart-single data-aggregation-service"'
+        }
     }
 }
diff --git a/data-aggregation-service/src/main/resources/logback-spring.xml b/data-aggregation-service/src/main/resources/logback-spring.xml
@@ -43,4 +43,10 @@
         <appender-ref ref="logstash"/>
         <appender-ref ref="CONSOLE"/>
     </root>
+
+    <logger name="org.springframework.cloud.config.client" level="warn"/>
+    <logger name="com.netflix.discovery.shared.resolver.aws" level="warn"/>
+    <logger name="com.netflix.discovery.DiscoveryClient" level="warn"/>
+    <logger name="logging.level.eu.nimble.service.dataaggregation.clients.IdentityClient" level="debug"/>
+    <logger name="logging.level.eu.nimble.service.dataaggregation.clients.BusinessProcessClient" level="debug"/>
 </configuration>
diff --git a/libs/common b/libs/common
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <!-- Unique entry point for version number management -->
-        <global.version>5.0.0-Staging</global.version>
+        <global.version>5.0.0</global.version>
     </properties>
 
     <modules>