From 21e58b5c6501c45b3cccf83ac65bce4eca1b5e11 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Thu, 27 Jan 2022 13:01:58 +0100
Subject: [PATCH 1/6] update jf

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 35315ed..e746163 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -120,8 +120,8 @@
                     sh 'chmod 755 ./bin/terraform-provider-dynatrace_v1.9.1'
                     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)

From f436e7f0b7bc664c52eb2b948b718d20c515fe70 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Thu, 27 Jan 2022 13:30:47 +0100
Subject: [PATCH 2/6] update jf

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e746163..68a2df3 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-slave'}
     
     
     //here comes the trigger according to crontabs - jenkins is in UTC

From 7305db920b70ddbce93ab3fcaa4731f31b356b31 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Thu, 27 Jan 2022 13:33:51 +0100
Subject: [PATCH 3/6] update jf

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 68a2df3..523fd73 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 'jaws-slave'}
+    agent {label 'jaws-slaves'}
     
     
     //here comes the trigger according to crontabs - jenkins is in UTC

From 9823c82e8d0da95f29cb4803a79030703a027135 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Thu, 27 Jan 2022 13:38:01 +0100
Subject: [PATCH 4/6] update jf

---
 Jenkinsfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 523fd73..b7a6281 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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')

From 0bcea9ccee06aafe85fa4e1e48a10130a8c55529 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Thu, 27 Jan 2022 13:44:13 +0100
Subject: [PATCH 5/6] update jf

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b7a6281..3e8d096 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -118,7 +118,8 @@
             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'

From eb153ea60400061410218760959dac3485c72eb3 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Thu, 27 Jan 2022 13:48:44 +0100
Subject: [PATCH 6/6] update jf

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3e8d096..e9cb5cd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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"