diff --git a/Jenkinsfile b/Jenkinsfile index 9a076e2288ef97a755bdae010e86fcc862c2cdea..e6aacf7f2567473cdae0c5e10f90889d85196462 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -205,7 +205,7 @@ pipeline { Void deployHelmChart(String helmChartVersion) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){ - result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@ozgcloud-elster-transfer-operator-'''+helmChartVersion+'''.tgz''', returnStdout: true + result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=''' + getHelmRepository() +''' -F file=@ozgcloud-elster-transfer-operator-'''+helmChartVersion+'''.tgz''', returnStdout: true if (result != '') { error(result) @@ -213,11 +213,11 @@ Void deployHelmChart(String helmChartVersion) { } } -String getHelmRepoUrl(){ +String getHelmRepository(){ if (isReleaseBranch()) { - return "https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps" + return 'ozg-base-apps' } - return "https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot" + return 'ozg-base-apps-snapshot' } String validateBranchName(branchName) {