From cbf2c687d1c47fe462496bc1f25b3ded53b3b568 Mon Sep 17 00:00:00 2001 From: rforstner Date: Mon, 31 Jan 2022 08:37:01 +0100 Subject: [PATCH] adaptions due to faulty jenkins slave --- Jenkinsfile | 2 +- createReport.py | 4 +++- environment.yaml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f7268c..1ecbf0a 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'} parameters { string(name: 'FROMDATE', defaultValue: '', description: 'Enter from date in format YYYY-MM-DD e.g. 2021-11-01') diff --git a/createReport.py b/createReport.py index fb4fa95..0ebb5ad 100644 --- a/createReport.py +++ b/createReport.py @@ -40,6 +40,8 @@ def getSLO(DTAPIToken, DTENV, fromDate, toDate): if (DTENV.find('dynatracemgd') != -1): verify=False + if (DTENV.find('dyna-synt') != -1): + verify=False else: verify=True @@ -69,7 +71,7 @@ def getSLO(DTAPIToken, DTENV, fromDate, toDate): print(e) print("No SLO json returned") print(parameters) - print(r.content) + print(r) df = pd.DataFrame() diff --git a/environment.yaml b/environment.yaml index b8043ad..6029dfd 100644 --- a/environment.yaml +++ b/environment.yaml @@ -20,7 +20,7 @@ naprod: - jenkins: "https://jaws.bmwgroup.net/opapm/" cnprod: - name: "cnprod" - - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b" + - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b" - env-token-name: "CNPROD_TOKEN_VAR" - jenkins: "https://jaws-china.bmwgroup.net/opmaas/" #cnpreprod: