diff --git a/Jenkinsfile b/Jenkinsfile index 10ec610..70b8d12 100644 --- 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,7 +107,7 @@ 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')]) { @@ -96,12 +115,26 @@ spec: } // 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}" ] + ]) + } + } } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index b5f0dff..b03f349 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.icgc.argo workflow-management - 2.1.0 + 2.1.1 workflow-management ARGO Workflow Management 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 index b6a9476..59d3b53 100644 --- 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());