diff --git a/Jenkinsfile b/Jenkinsfile index ade4202..8b67df7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,24 +14,6 @@ pipeline { triggers { cron('0 5 * * 0-7') } - - environment { - AUTH = credentials('proxy') - proxy_user = "${AUTH_USR}" - proxy_pw = "${AUTH_PSW}" - env.EMEA_PROD_API_TOKEN = credentials('EUPROD_TOKEN_VAR') - env.EMEA_PROD_ENV_URL = 'https://xxu26128.live.dynatrace.com' - env.EMEA_PREPROD_API_TOKEN = credentials('EUPREPROD_TOKEN_VAR') - env.EMEA_PREPROD_ENV_URL = 'https://qqk70169.live.dynatrace.com' - env.NA_PROD_API_TOKEN = credentials('NAPROD_TOKEN_VAR') - env.NA_PROD_ENV_URL = 'https://wgv50241.live.dynatrace.com' - env.NA_PREPROD_API_TOKEN = credentials('NAPREPROD_TOKEN_VAR') - env.NA_PREPROD_ENV_URL = 'https://onb44935.live.dynatrace.com' - env.CN_PROD_API_TOKEN = credentials('CNPROD_TOKEN_VAR') - env.CN_PROD_ENV_URL= 'https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b' - env.CN_PREPROD_API_TOKEN = credentials('CNPREPROD_TOKEN_VAR') - env.CN_PREPROD_ENV_URL = 'https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35' - } stages { stage('Fetch Data') { @@ -99,7 +81,18 @@ pipeline { sleep(300*exportRetryCount) script { exportRetryCount = exportRetryCount + 1 - sh "printenv" + env.EMEA_PROD_API_TOKEN = credentials('EUPROD_TOKEN_VAR') + env.EMEA_PROD_ENV_URL = 'https://xxu26128.live.dynatrace.com' + env.EMEA_PREPROD_API_TOKEN = credentials('EUPREPROD_TOKEN_VAR') + env.EMEA_PREPROD_ENV_URL = 'https://qqk70169.live.dynatrace.com' + env.NA_PROD_API_TOKEN = credentials('NAPROD_TOKEN_VAR') + env.NA_PROD_ENV_URL = 'https://wgv50241.live.dynatrace.com' + env.NA_PREPROD_API_TOKEN = credentials('NAPREPROD_TOKEN_VAR') + env.NA_PREPROD_ENV_URL = 'https://onb44935.live.dynatrace.com' + env.CN_PROD_API_TOKEN = credentials('CNPROD_TOKEN_VAR') + env.CN_PROD_ENV_URL= 'https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b' + env.CN_PREPROD_API_TOKEN = credentials('CNPREPROD_TOKEN_VAR') + env.CN_PREPROD_ENV_URL = 'https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35' sh "chmod 755 terraform-provider-dynatrace_v1.30.2" sh "sudo python3 export.py" } diff --git a/export.py b/export.py index a09d039..d6e1f41 100644 --- a/export.py +++ b/export.py @@ -9,8 +9,8 @@ from glob import glob def setEnv(env, time, path, dashboard): - os.environ['DYNATRACE_ENV_URL'] = str(os.environ.get(env + "_ENV_URL")) - os.environ['DYNATRACE_API_TOKEN'] = str(os.environ.get(env + "_API_TOKEN")) + os.environ['DYNATRACE_ENV_URL'] = str(os.getenv(env + "_ENV_URL")) + os.environ['DYNATRACE_API_TOKEN'] = str(os.getenv(env + "_API_TOKEN")) os.environ['DYNATRACE_TARGET_FOLDER'] = str(path + time + "_" + env + dashboard) return os.environ