diff --git a/Jenkinsfile b/Jenkinsfile index 3d022e11855fec668ebd8cc275759fd1be00bb3b..894428b39c2e01f6a3f35a0fbf1a61aaefca3eaf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { node { - label 'jenkins-build-agent-nodejs-16' + label 'jenkins-build-agent' } } @@ -130,7 +130,7 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME E2E_FAILED = "" - + configFileProvider([configFile(fileId: 'kubeconfig-dev-cluster', variable: 'KUBE_CONFIG')]) { sh 'mkdir ~/.kube' sh 'cp ${KUBE_CONFIG} ~/.kube/config' @@ -178,7 +178,7 @@ pipeline { } } } - + stage('Test, build and deploy Helm Chart') { steps { script { @@ -206,11 +206,11 @@ pipeline { script { if(currentBuild.changeSets.size() > 0) { FAILED_STAGE = env.STAGE_NAME - + checkoutProvisioningRepo() - + setNewGoofyProvisioningVersion('dev') - + pushNewProvisioningVersion('dev') } else { @@ -338,7 +338,7 @@ pipeline { } } -Void deployHelmChart(String helmChartVersion) { +Void deployHelmChart(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=@goofy-'''+helmChartVersion+'''.tgz''', returnStdout: true @@ -672,7 +672,7 @@ String generateCypressConfig(String stage, String bezeichner, String testFolder, environment = config.env environment.put("search", elasticsearchEnv) - + environment.put("userManager", getUserManagerEnv(namespace, dbPort)); writeJSON file: configName, json: config