Merge pull request #540 from overture-stack/rc/3.0.1

Release 3.0.1
overture-stack · Nov 26, 2019 · a47ccb6 · a47ccb6
2 parents 3677339 + 6950a23
commit a47ccb6
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 39 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -44,4 +44,4 @@ WORKDIR $SONG_HOME
 CMD mkdir -p  $SONG_HOME $SONG_LOGS \
         && java -Dlog.path=$SONG_LOGS \
         -jar $JAR_FILE \
-        --spring.config.location=classpath:/application.yml
+        --spring.config.location=classpath:/bootstrap.properties,classpath:/application.yml
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -36,4 +36,4 @@ WORKDIR $SONG_HOME
 CMD mkdir -p  $SONG_HOME $SONG_LOGS \
         && java -Dlog.path=$SONG_LOGS \
         -jar $JAR_FILE \
-		--spring.config.location=classpath:/application.yml,classpath:/bootstrap.properties
+        --spring.config.location=classpath:/bootstrap.properties,classpath:/application.yml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,29 @@
-def commit = "UNKNOWN"
+import groovy.json.JsonOutput
+
 def version = "UNKNOWN"
+def commit = "UNKNOWN"
+def repo = "UNKNOWN"
+
+def pom(path, target) {
+    return [pattern: "${path}/pom.xml", target: "${target}.pom"]
+}
+
+def jar(path, target) {
+    return [pattern: "${path}/target/*.jar",
+            target         : "${target}.jar",
+            excludePatterns: ["*-exec.jar"]
+            ]
+}
+
+def tar(path, target) {
+    return [pattern: "${path}/target/*.tar.gz",
+            target : "${target}-dist.tar.gz"]
+}
+
+def runjar(path, target) {
+    return [pattern: "${path}/target/*-exec.jar",
+            target : "${target}-exec.jar"]
+}
 
 pipeline {
     agent {
@@ -58,7 +82,7 @@ spec:
         stage('Test') {
             steps {
                 container('jdk') {
-                    sh "./mvnw test"
+                    sh "./mvnw test package"
                 }
             }
         }
@@ -103,45 +127,72 @@ spec:
             }
         }
 
-        stage('Deploy to Overture QA') {
+        stage('Destination SNAPSHOT') {
             when {
-                  branch "develop"
+                anyOf {
+                    branch 'develop'
+                    branch 'test-develop'
+                }
             }
             steps {
-                container('helm') {
-                    withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
-                        sh 'env'
-                        sh 'helm init --client-only'
-                        sh "helm ls --kubeconfig $KUBECONFIG"
-                        sh "helm repo add overture https://overture-stack.github.io/charts-server/"
-                        sh """
-                            helm upgrade --kubeconfig $KUBECONFIG --install --namespace=overture-qa song-overture-qa \\
-                            overture/song --reuse-values --set-string image.tag=${commit}
-                           """
-                    }
+                script {
+                    repo = "dcc-snapshot/bio/overture"
                 }
             }
         }
 
-        stage('Deploy to Overture Staging') {
+        stage('Destination release') {
             when {
-                  branch "master"
+                anyOf {
+                    branch 'master'
+                    branch 'test-master'
+                }
             }
             steps {
-                container('helm') {
-                    withCredentials([file(credentialsId:'4ed1e45c-b552-466b-8f86-729402993e3b', variable: 'KUBECONFIG')]) {
-                        sh 'env'
-                        sh 'helm init --client-only'
-                        sh "helm ls --kubeconfig $KUBECONFIG"
-                        sh "helm repo add overture https://overture-stack.github.io/charts-server/"
-                        sh """
-                            helm upgrade --kubeconfig $KUBECONFIG --install --namespace=overture-staging song-overture-staging \\
-                            overture/song --reuse-values --set-string image.tag=${version}
-                           """
-                    }
+                script {
+                    repo = "dcc-release/bio/overture"
                 }
             }
         }
 
+        stage('Upload Artifacts') {
+            when {
+                anyOf {
+                    branch 'master'
+                    branch 'test-master'
+                    branch 'develop'
+                    branch 'test-develop'
+                }
+            }
+            steps {
+                script {
+
+                    project = "song"
+                    versionName = "$version"
+                    subProjects = ['client', 'core', 'server']
+
+                    files = []
+                    files.add([pattern: "pom.xml", target: "$repo/$project/$versionName/$project-${versionName}.pom"])
+
+                    for (s in subProjects) {
+                        name = "${project}-$s"
+                        target = "$repo/$name/$versionName/$name-$versionName"
+                        files.add(pom(name, target))
+                        files.add(jar(name, target))
+
+                        if (s in ['client', 'server']) {
+                            files.add(runjar(name, target))
+                            files.add(tar(name, target))
+                        }
+                    }
+
+                    fileSet = JsonOutput.toJson([files: files])
+                    pretty = JsonOutput.prettyPrint(fileSet)
+                    print("Uploading files=${pretty}")
+                }
+
+                rtUpload(serverId: 'artifactory', spec: fileSet)
+            }
+        }
     }
 }
diff --git a/Makefile b/Makefile
@@ -237,7 +237,7 @@ get-analysis-id:
 
 test-submit: start-song-server _ping_song_server
 	@echo $(YELLOW)$(INFO_HEADER) "Submitting payload /data/submit/exampleVariantCall.json" $(END)
-	@$(SONG_CLIENT_CMD) submit -f /data/submit/exampleVariantCall.json |& tee $(SONG_CLIENT_SUBMIT_RESPONSE_FILE)
+	@$(SONG_CLIENT_CMD) submit -f /data/submit/exampleVariantCall.json | tee $(SONG_CLIENT_SUBMIT_RESPONSE_FILE)
 	@cat $(SONG_CLIENT_SUBMIT_RESPONSE_FILE) | grep analysisId | sed 's/.*://' | sed 's/"\|,//g'  > $(SONG_CLIENT_ANALYSIS_ID_FILE)
 	@echo $(YELLOW)$(INFO_HEADER) "Successfully submitted. Cached analysisId: " $$($(GET_ANALYSIS_ID_CMD)) $(END)
 

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>bio.overture</groupId>
     <artifactId>song</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
     <modules>
         <module>song-core</module>
         <module>song-java-sdk</module>

diff --git a/song-client/pom.xml b/song-client/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<artifactId>song</artifactId>
 		<groupId>bio.overture</groupId>
-		<version>3.0.0</version>
+		<version>3.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -35,12 +35,12 @@
 		<dependency>
 			<groupId>bio.overture</groupId>
 			<artifactId>song-java-sdk</artifactId>
-			<version>3.0.0</version>
+			<version>3.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>bio.overture</groupId>
 			<artifactId>song-core</artifactId>
-			<version>3.0.0</version>
+			<version>3.0.1</version>
 		</dependency>
 
 		<!-- CLI -->

diff --git a/song-core/pom.xml b/song-core/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<artifactId>song</artifactId>
 		<groupId>bio.overture</groupId>
-		<version>3.0.0</version>
+		<version>3.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/song-java-sdk/pom.xml b/song-java-sdk/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<artifactId>song</artifactId>
 		<groupId>bio.overture</groupId>
-		<version>3.0.0</version>
+		<version>3.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/song-server/pom.xml b/song-server/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>song</artifactId>
         <groupId>bio.overture</groupId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>bio.overture</groupId>
             <artifactId>song-core</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.1</version>
         </dependency>
 
         <!-- Spring -->