Release 2.1.1 (#92)

* snapshot version * Update vars. Update. Add dev dev deployment stage. * Prep dev deploy stage for merge into develop branch. Add qa deploy stage for master branch. * toString() on null resume param results in null pointer * release 2.1.1 Co-authored-by: Yelizar Alturmessov <yalturmessov@oicr.on.ca> Co-authored-by: Dušan Andrić <Dusan.Andric@gmail.com>
icgc-argo · Jul 8, 2020 · 7b1e28a · 7b1e28a
1 parent 2b5c8ab
commit 7b1e28a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,3 +1,6 @@
+def dockerHubRepo = "icgcargo/workflow-management"
+def githubRepo = "icgc-argo/workflow-management"
+def chartVersion = "0.3.0"
 def commit = "UNKNOWN"
 def version = "UNKNOWN"
 
@@ -73,13 +76,29 @@ spec:
                     }
 
                     // DNS error if --network is default
-                    sh "docker build --network=host . -t icgcargo/workflow-management:edge -t icgcargo/workflow-management:${version}-${commit}"
+                    sh "docker build --network=host . -t ${dockerHubRepo}:edge -t ${dockerHubRepo}:${version}-${commit}"
 
-                    sh "docker push icgcargo/workflow-management:${version}-${commit}"
-                    sh "docker push icgcargo/workflow-management:edge"
+                    sh "docker push ${dockerHubRepo}:${version}-${commit}"
+                    sh "docker push ${dockerHubRepo}:edge"
                 }
             }
         }
+
+        stage('deploy to rdpc-collab-dev') {
+            when {
+                branch "develop"
+            }
+            steps {
+                build(job: "/provision/helm", parameters: [
+                    [$class: 'StringParameterValue', name: 'AP_RDPC_ENV', value: 'dev' ],
+                    [$class: 'StringParameterValue', name: 'AP_CHART_NAME', value: 'workflow-management'],
+                    [$class: 'StringParameterValue', name: 'AP_RELEASE_NAME', value: 'management'],
+                    [$class: 'StringParameterValue', name: 'AP_HELM_CHART_VERSION', value: "${chartVersion}"],
+                    [$class: 'StringParameterValue', name: 'AP_ARGS_LINE', value: "--set-string image.tag=${version}-${commit}" ]
+                ])
+            }
+        }
+
         stage('Release & Tag') {
             when {
                 branch "master"
@@ -88,20 +107,34 @@ spec:
                 container('docker') {
                     withCredentials([usernamePassword(credentialsId: 'argoGithub', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
                         sh "git tag ${version}"
-                      sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/icgc-argo/workflow-management --tags"
+                      sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${gitHubRepo} --tags"
                     }
 
                     withCredentials([usernamePassword(credentialsId:'argoDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                         sh 'docker login -u $USERNAME -p $PASSWORD'
                     }
 
                     // DNS error if --network is default
-                    sh "docker build --network=host . -t icgcargo/workflow-management:latest -t icgcargo/workflow-management:${version}"
+                    sh "docker build --network=host . -t ${dockerHubRepo}:latest -t ${dockerHubRepo}:${version}"
 
-                    sh "docker push icgcargo/workflow-management:${version}"
-                    sh "docker push icgcargo/workflow-management:latest"
+                    sh "docker push ${dockerHubRepo}:${version}"
+                    sh "docker push ${dockerHubRepo}:latest"
                 }
             }
         }
+        stage('deploy to rdpc-collab-qa') {
+            when {
+                branch "master"
+            }
+            steps {
+                build(job: "/provision/helm", parameters: [
+                    [$class: 'StringParameterValue', name: 'AP_RDPC_ENV', value: 'qa' ],
+                    [$class: 'StringParameterValue', name: 'AP_CHART_NAME', value: 'workflow-management'],
+                    [$class: 'StringParameterValue', name: 'AP_RELEASE_NAME', value: 'management'],
+                    [$class: 'StringParameterValue', name: 'AP_HELM_CHART_VERSION', value: "${chartVersion}"],
+                    [$class: 'StringParameterValue', name: 'AP_ARGS_LINE', value: "--set-string image.tag=${version}" ]
+                ])
+            }
+        }
     }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>org.icgc.argo</groupId>
     <artifactId>workflow-management</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <name>workflow-management</name>
     <description>ARGO Workflow Management</description>
 

diff --git a/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java b/src/main/java/org/icgc/argo/workflow_management/service/NextflowService.java
@@ -261,7 +261,7 @@ private CmdKubeRun createCmd(@NonNull Launcher launcher, @NonNull WESRunParams p
     cmdParams.put("runConfig", List.of(config));
 
     // Resume workflow by name/id
-    cmdParams.put("resume", workflowEngineParams.getResume().toString());
+    cmdParams.put("resume", workflowEngineParams.getResume(), Object::toString);
 
     // Use revision if provided in workflow_engine_options
     cmdParams.put("revision", workflowEngineParams.getRevision());