diff --git a/Jenkinsfile b/Jenkinsfile index 9a99789..1affb21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,9 +9,17 @@ options { ansiColor('xterm') } - agent{label 'jaws-slaves'} + agent{label 'on-prem-slaves'} environment { - + AUTH = credentials('proxy') + proxy_user = "${AUTH_USR}" + proxy_pw = "${AUTH_PSW}" + http_proxy="http://${proxy_user}:${proxy_pw}@proxy.muc:8080" + https_proxy="http://${proxy_user}:${proxy_pw}@proxy.muc:8080" + no_proxy="localhost,127.0.0.1,.muc,.bmwgroup.net" + HTTP_PROXY="${http_proxy}" + HTTPS_PROXY="${https_proxy}" + NO_PROXY="${no_proxy}" CICD_Testing_TOKEN = credentials('dynatrace_automation_testing_token') } @@ -115,7 +123,7 @@ envs.each { env -> if(params['APPLICATION'] != null){ folders.each { folder -> - sh "cd ${folder} && monaco -v -e $WORKSPACE/environment.yaml -se ${env} --dry-run" + sh "monaco -v -e $WORKSPACE/environment.yaml -se ${env} --project ${folder} --dry-run" } } else{ println "Application not selected" @@ -140,7 +148,7 @@ if(params['APPLICATION'] != null){ folders.each { folder -> sh "set +x && echo ------------ Starting Deployment on environment $env for app $folder -----------" - sh "cd ${folder} && monaco -v -e $WORKSPACE/environment.yaml -se ${env}" + sh "monaco -v -e $WORKSPACE/environment.yaml -se ${env} --project ${folder}" } } else{ println "Application not selected" diff --git a/environment.yaml b/environment.yaml index 5757405..38fe56e 100644 --- a/environment.yaml +++ b/environment.yaml @@ -1,4 +1,4 @@ CICD-Testing: - name: "DE-8_Test_1" - - env-url: "https://ltdynatsv01.bmwgroup.net:8021/" - - env-token-name: "CICD_Testing_TOKEN" \ No newline at end of file + - env-url: "https://ltdynatsv01.bmwgroup.net:8021/e/2cd2c72b-db3f-41fe-bb62-219dae76eac8/" + - env-token-name: "CICD_Testing_TOKEN"