diff --git a/Jenkinsfile b/Jenkinsfile index 35315ed..e9cb5cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ ansiColor('xterm') } //label libraryBuild is available in CN JAWS and ROW JAWS, therefore this one was used; no additional intents - agent {label 'libraryBuild'} + agent {label 'jaws-slaves'} //here comes the trigger according to crontabs - jenkins is in UTC @@ -43,12 +43,12 @@ 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}" + //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}" // EUPROD_TOKEN_VAR = credentials('EUPROD_TOKEN_VAR') // EUPREPROD_TOKEN_VAR = credentials('EUPREPROD_TOKEN_VAR') @@ -56,8 +56,8 @@ // NAPREPROD_TOKEN_VAR = credentials('NAPREPROD_TOKEN_VAR') // CNPROD_TOKEN_VAR = credentials('CNPROD_TOKEN_VAR') // CNPREPROD_TOKEN_VAR = credentials('CNPREPROD_TOKEN_VAR') - // AWS_ACCESS_KEY_ID = credentials('AWS_TERRAFORM_KEY') - // AWS_SECRET_ACCESS_KEY = credentials('AWS_SECRET_ACCESS_KEY') + AWS_ACCESS_KEY_ID = credentials('AWS_TERRAFORM_KEY') + AWS_SECRET_ACCESS_KEY = credentials('AWS_SECRET_ACCESS_KEY') TERRAFORM_RESOURCES="dynatrace_management_zone" @@ -118,10 +118,11 @@ steps { sh 'chmod 755 ./bin/terraform-provider-dynatrace_v1.9.1' - sh 'sudo zypper refresh' + sh 'python3 --version' + //sh 'sudo zypper refresh' - sh 'chmod 755 ./updatepython.sh' - sh './updatepython.sh' + //sh 'chmod 755 ./updatepython.sh' + //sh './updatepython.sh' //Only required once CN is not reachable from EMEA //loopEnvironments(environments)