From 8cbb73eae7de5225b094ea75357dec6fc642c0ca Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 13 Nov 2024 08:50:06 +0100
Subject: [PATCH] OZG-6368 adjust baseUrl on admin Application
---
alfa-client/Jenkinsfile.e2e | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index 772abf0656..9b55f66a51 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -750,7 +750,7 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian
def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
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.keycloakUrl = "https://${env.SSO_URL}/" as String
config.env.keycloakRealm = namespace as String
@@ -773,6 +773,13 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian
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) {
--
GitLab