Skip to content
Snippets Groups Projects
Commit d69b4d8d authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3792 OZG-3917 pass namespace

parent eed8814d
No related branches found
No related tags found
No related merge requests found
...@@ -322,7 +322,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor ...@@ -322,7 +322,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
config.env.put("search", getElasticsearchEnv(namespace)) config.env.put("search", getElasticsearchEnv(namespace))
config.env.put("userManager", getUserManagerEnv(dbPort)) config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
writeJSON file: configName, json: config writeJSON file: configName, json: config
...@@ -336,8 +336,8 @@ Map getPlutoDatabaseSecret(String namespace) { ...@@ -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)) return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-pluto-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
} }
Map getUserManagerEnv(dbPort){ Map getUserManagerEnv(String namespace, dbPort){
def plutoDatabaseUserManagerSecret = getPlutoDatabaseUserManagerSecret(); def plutoDatabaseUserManagerSecret = getPlutoDatabaseUserManagerSecret(namespace);
return [ return [
"dbUrl": "mongodb://user-manager-database-user:${decodeString(plutoDatabaseUserManagerSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String, "dbUrl": "mongodb://user-manager-database-user:${decodeString(plutoDatabaseUserManagerSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String,
"database": "user-manager-database" "database": "user-manager-database"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment