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

OZG-6368 adjust baseUrl on admin Application

parent 748d5189
Branches
Tags
No related merge requests found
...@@ -750,7 +750,7 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian ...@@ -750,7 +750,7 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian
def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password); def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
def parsablePassword = makePasswordUrlConform(decodedPassword); def parsablePassword = makePasswordUrlConform(decodedPassword);
config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String config.baseUrl = "https://${generateUrlBezeichner(bezeichner, appName)}.${env.CLUSTER_BASE_URL}" as String
config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true&socketTimeoutMS=30000&heartbeatFrequencyMS=10000" as String config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true&socketTimeoutMS=30000&heartbeatFrequencyMS=10000" as String
config.env.keycloakUrl = "https://${env.SSO_URL}/" as String config.env.keycloakUrl = "https://${env.SSO_URL}/" as String
config.env.keycloakRealm = namespace as String config.env.keycloakRealm = namespace as String
...@@ -773,6 +773,13 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian ...@@ -773,6 +773,13 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian
return "cypress-ci-"+appVariant+".config.ts" return "cypress-ci-"+appVariant+".config.ts"
} }
String generateUrlBezeichner(String bezeichner, String appName){
if(appName == 'admin-e2e'){
return "${bezeichner}-admin";
}
return bezeichner;
}
String makePasswordUrlConform(String password) { String makePasswordUrlConform(String password) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment