From 04f700e832cc5cb21abb54add5bd021af41831b2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 1 Dec 2023 13:10:47 +0100
Subject: [PATCH] use local variables
---
alfa-client/apps/alfa-e2e/Jenkinsfile | 8 ++++----
alfa-client/apps/alfa-e2e/Jenkinsfile-static | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 563c75362e..3697c71a83 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -381,7 +381,7 @@ String getRootPomVersion() {
}
Void initEnvVorgangManagerDefaultVersions() {
- values = getApplicationValues('vorgang-manager')
+ def values = getApplicationValues('vorgang-manager')
env.VORGANG_MANAGER_IMAGE_TAG = getImageTag(values)
env.VORGANG_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -389,7 +389,7 @@ Void initEnvVorgangManagerDefaultVersions() {
}
Void initEnvUserManagerDefaultVersions() {
- values = getApplicationValues('user-manager')
+ def values = getApplicationValues('user-manager')
env.USER_MANAGER_IMAGE_TAG = getImageTag(values)
env.USER_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -735,7 +735,7 @@ String getKeycloakUuid(realm, userName) {
}
String getKeycloakAccessToken(String realm) {
- userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm)
+ def userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm)
def token = readJSON text: sh (script: "set +x && curl -d \"client_id=admin-cli\" -d \"username=${userManagerApiUserCredentials.user}\" -d \"password=${userManagerApiUserCredentials.password}\" -d \"grant_type=password\" https://$SSO_URL/realms/$realm/protocol/openid-connect/token", returnStdout: true)
@@ -743,7 +743,7 @@ String getKeycloakAccessToken(String realm) {
}
Map getUserManagerApiUserCredentials(String namespace) {
- userManagerApiUserCredentials = readJSON ( text: sh (script: "kubectl get secret usermanagerapiuser-credentials -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+ def userManagerApiUserCredentials = readJSON ( text: sh (script: "kubectl get secret usermanagerapiuser-credentials -n ${namespace} -o jsonpath={.data}", returnStdout: true))
return [
"user": decodeString(userManagerApiUserCredentials.name),
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile-static b/alfa-client/apps/alfa-e2e/Jenkinsfile-static
index d22140c0a0..c430b502d8 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile-static
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile-static
@@ -444,7 +444,7 @@ String getKeycloakUuid(realm, userName) {
}
String getKeycloakAccessToken(String realm) {
- userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm)
+ def userManagerApiUserCredentials = getUserManagerApiUserCredentials(realm)
def token = readJSON text: sh (script: "set +x && curl -d \"client_id=admin-cli\" -d \"username=${userManagerApiUserCredentials.user}\" -d \"password=${userManagerApiUserCredentials.password}\" -d \"grant_type=password\" https://$SSO_URL/realms/$realm/protocol/openid-connect/token", returnStdout: true)
@@ -452,7 +452,7 @@ String getKeycloakAccessToken(String realm) {
}
Map getUserManagerApiUserCredentials(String namespace) {
- userManagerApiUserCredentials = readJSON ( text: sh (script: "kubectl get secret usermanagerapiuser-credentials -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+ def userManagerApiUserCredentials = readJSON ( text: sh (script: "kubectl get secret usermanagerapiuser-credentials -n ${namespace} -o jsonpath={.data}", returnStdout: true))
return [
"user": decodeString(userManagerApiUserCredentials.name),
--
GitLab