From 86d70bb4577c0e2e3adfe1798eebadff5c4a6fed Mon Sep 17 00:00:00 2001 From: ermisw Date: Wed, 26 Jan 2022 15:30:10 +0100 Subject: [PATCH] modified environment variables jenkins pipeline & python stage --- Jenkinsfile | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6024f15..a7e65c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,14 +50,22 @@ HTTPS_PROXY="${https_proxy}" NO_PROXY="${no_proxy}" - EUPROD_TOKEN_VAR = credentials('EUPROD_TOKEN_VAR') - EUPREPROD_TOKEN_VAR = credentials('EUPREPROD_TOKEN_VAR') - NAPROD_TOKEN_VAR = credentials('NAPROD_TOKEN_VAR') - 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') + // EUPROD_TOKEN_VAR = credentials('EUPROD_TOKEN_VAR') + // EUPREPROD_TOKEN_VAR = credentials('EUPREPROD_TOKEN_VAR') + // NAPROD_TOKEN_VAR = credentials('NAPROD_TOKEN_VAR') + // 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') + + //EMEA PROD + TF_VAR_EMEA_PROD_ENV_URL= + TF_VAR_EMEA_PROD_API_TOKEN=credentials('EUPROD_TOKEN_VAR') + + //EMEA PREPROD + TF_VAR_EMEA_PREPROD_ENV_URL= + TF_VAR_EMEA_PREPROD_API_TOKEN=credentials('EUPREPROD_TOKEN_VAR') } @@ -84,10 +92,10 @@ } } - stage('Execute Reporting Script') { + stage('Execute Export Script EMEA PROD') { steps { - sh 'python createReport.py' + sh 'python export.py EMEA_PROD dynatrace_autotag' //Only required once CN is not reachable from EMEA //loopEnvironments(environments)