diff --git a/Jenkinsfile b/Jenkinsfile index 119b4bddc298561d808dbe55876e80a08ca064fb..df3f4dd8808ed7b751eee1d224a3ebe993435da9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { node { - label 'jenkins-build-agent' + label 'jenkins-build-agent-nodejs-16' } } @@ -127,7 +127,7 @@ pipeline { script { FAILED_STAGE = env.STAGE_NAME E2E_FAILED = "" - + configFileProvider([configFile(fileId: 'kubeconfig-old-dev-cluster', variable: 'KUBE_CONFIG')]) { sh 'mkdir ~/.kube' sh 'cp ${KUBE_CONFIG} ~/.kube/config' @@ -177,7 +177,7 @@ pipeline { } } } - + stage('Test, build and deploy Helm Chart') { steps { script { @@ -205,11 +205,11 @@ pipeline { script { if(currentBuild.changeSets.size() > 0) { FAILED_STAGE = env.STAGE_NAME - + checkoutProvisioningRepo() - + setNewGoofyProvisioningVersion('dev') - + pushNewProvisioningVersion('dev') } else { @@ -337,7 +337,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 @@ -657,7 +657,7 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) { String generateCypressConfig(String stage, String bezeichner, String testFolder, String bundesland, dbPort) { def namespace = "${bundesland}-${bezeichner}-dev" def configName = "cypress-ci-"+testFolder+".json" - + def url = "dev.ozg-sh.de" dir('goofy-client/apps/goofy-e2e/'){ @@ -676,7 +676,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