diff --git a/Jenkinsfile b/Jenkinsfile index 4859fed0b0d64ee29d7b4736bdf21122207858ba..6f8d5394698ea310d65a3bf3609b081a23a58bee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,7 +84,7 @@ pipeline { when { anyOf { branch 'master' -# branch 'release' + branch 'release' } } steps { @@ -114,12 +114,12 @@ pipeline { tagAndPushDockerImage('formcycle-adapter', 'snapshot-latest') tagAndPushDockerImage('xta-adapter', 'snapshot-latest') } -# else if (env.BRANCH_NAME == 'release') { -# tagAndPushDockerImage('intelliform-adapter', 'latest') -# tagAndPushDockerImage('formsolutions-adapter', 'latest') -# tagAndPushDockerImage('formcycle-adapter', 'latest') -# tagAndPushDockerImage('xta-adapter', 'latest') -# } + else if (env.BRANCH_NAME == 'release') { + tagAndPushDockerImage('intelliform-adapter', 'latest') + tagAndPushDockerImage('formsolutions-adapter', 'latest') + tagAndPushDockerImage('formcycle-adapter', 'latest') + tagAndPushDockerImage('xta-adapter', 'latest') + } } } } @@ -180,7 +180,7 @@ pipeline { } stage('Trigger Test rollout') { when { -# branch 'release' + branch 'release' } steps { @@ -200,7 +200,7 @@ pipeline { when { anyOf { branch 'master' -# branch 'release' + branch 'release' } } steps { @@ -231,12 +231,12 @@ pipeline { Void deployHelmChart(String helmChartName, String helmChartVersion) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){ - # if (env.BRANCH_NAME == 'release') { - # result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F #file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true - # } - # else { + if (env.BRANCH_NAME == 'release') { + result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F #file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true + } + else { result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@'''+helmChartName+'''-'''+helmChartVersion+'''.tgz''', returnStdout: true - # } + } if (result != '') { error(result)