From d8008d16c91a7c7ae195471107976f6fde80e958 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 1 Oct 2024 17:33:16 +0200
Subject: [PATCH] OZG-6368 Add Keycloak client
---
alfa-client/Jenkinsfile.e2e | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index b84db5dedf..dcd3307a07 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -24,6 +24,8 @@ pipeline {
EA_BEZEICHNER = generateBezeichner("e2e-ea")
MAIN_BEZEICHNER = generateBezeichner("e2e-main")
SH_SUCCESS_STATUS_CODE = 0
+ KEYCLOAK_CLIENT_ADMIN_APP = "admin"
+ KEYCLOAK_CLIENT_ALFA_APP = "alfa"
}
options {
@@ -254,7 +256,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
- runTests(bezeichner, 'alfa-e2e','einheitlicher-ansprechpartner', mongoDbPort, env.STAGE_NAME)
+ runTests(bezeichner, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner))
}
@@ -285,7 +287,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
- runTests(bezeichner, 'alfa-e2e','main-tests', mongoDbPort, env.STAGE_NAME)
+ runTests(bezeichner, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner))
}
@@ -315,7 +317,7 @@ pipeline {
Integer mongoDbPort = forwardMongoDbPort(generateNamespace(bezeichner))
- runTests(bezeichner, 'admin-e2e','main-tests', mongoDbPort, env.STAGE_NAME)
+ runTests(bezeichner, 'admin-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ADMIN_APP, mongoDbPort, env.STAGE_NAME)
stopForwardMongoDbPort(generateNamespace(bezeichner))
}
@@ -635,11 +637,11 @@ Void publishE2ETestResult(String appName, String appVariant, String reportName)
)
}
-// runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'einheitlicher-ansprechpartner', mongoDbPort, env.STAGE_NAME
-// runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'main-tests', mongoDbPort, env.STAGE_NAME
-// runTests(env.EA_BEZEICHNER, 'admin-e2e', 'main-tests', mongoDbPort, env.STAGE_NAME
-String runTests(String bezeichner, String appName, String appVariant, Integer dbPort, String stageName) {
- def config = generateCypressConfig(bezeichner, appName, appVariant, dbPort)
+// runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'einheitlicher-ansprechpartner', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME
+// runTests(env.EA_BEZEICHNER, 'alfa-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ALFA_APP, mongoDbPort, env.STAGE_NAME
+// runTests(env.EA_BEZEICHNER, 'admin-e2e', 'main-tests', env.KEYCLOAK_CLIENT_ADMIN_APP, mongoDbPort, env.STAGE_NAME
+String runTests(String bezeichner, String appName, String appVariant, String keycloakClientName, Integer dbPort, String stageName) {
+ def config = generateCypressConfig(bezeichner, appName, appVariant, keycloakClientName, dbPort)
try {
dir('alfa-client'){
sh "npm run cypress:version"
@@ -680,7 +682,7 @@ String cutBranchNameForKeycloakRealm(String branchName, String stageName) {
return branchName.take(cutBranchNamePosition)
}
-String generateCypressConfig(String bezeichner, String appName, String appVariant, Integer dbPort) {
+String generateCypressConfig(String bezeichner, String appName, String appVariant, String keycloakClientName, Integer dbPort) {
def namespace = generateNamespace(bezeichner)
def configName = "cypress-ci-"+appVariant+".json"
@@ -695,6 +697,7 @@ String generateCypressConfig(String bezeichner, String appName, String appVarian
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
+ config.env.keycloakClient = keycloakClientName as String
config.videosFolder = "./reports/${appVariant}/videos" as String
config.screenshotsFolder = "./reports/${appVariant}/screenshots" as String
config.reporterOptions.reportDir = "./reports/${appVariant}/mochawesome-report" as String
--
GitLab