diff --git a/Jenkinsfile b/Jenkinsfile
index eb963a8..afec7f9 100644
--- 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"'
+ }
}
}
\ No newline at end of file
diff --git a/data-aggregation-service/src/main/resources/logback-spring.xml b/data-aggregation-service/src/main/resources/logback-spring.xml
index 1c2d4e7..9dc3a12 100755
--- a/data-aggregation-service/src/main/resources/logback-spring.xml
+++ b/data-aggregation-service/src/main/resources/logback-spring.xml
@@ -43,4 +43,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libs/common b/libs/common
index 5442b04..f418e7e 160000
--- a/libs/common
+++ b/libs/common
@@ -1 +1 @@
-Subproject commit 5442b04bf9dadc4f09d9948dd8776fd0b877fdef
+Subproject commit f418e7ea5d45dbaa061d305329334887ee1d368e
diff --git a/pom.xml b/pom.xml
index 7112970..f34ab5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
- 5.0.0-Staging
+ 5.0.0