From d69b4d8d2c8ed1459fd25fa04c2475f2be12c493 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 1 Jun 2023 13:22:22 +0200
Subject: [PATCH] OZG-3792 OZG-3917 pass namespace
---
goofy-client/apps/goofy-e2e/Jenkinsfile-static | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile-static b/goofy-client/apps/goofy-e2e/Jenkinsfile-static
index bed6bba5ad..13023ef57f 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile-static
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile-static
@@ -322,7 +322,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
config.env.put("search", getElasticsearchEnv(namespace))
- config.env.put("userManager", getUserManagerEnv(dbPort))
+ config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
writeJSON file: configName, json: config
@@ -336,8 +336,8 @@ Map getPlutoDatabaseSecret(String namespace) {
return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-pluto-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
-Map getUserManagerEnv(dbPort){
- def plutoDatabaseUserManagerSecret = getPlutoDatabaseUserManagerSecret();
+Map getUserManagerEnv(String namespace, dbPort){
+ def plutoDatabaseUserManagerSecret = getPlutoDatabaseUserManagerSecret(namespace);
return [
"dbUrl": "mongodb://user-manager-database-user:${decodeString(plutoDatabaseUserManagerSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String,
"database": "user-manager-database"
--
GitLab