diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile index b1e43bee419ca9a390eefca06b0754194ffaca9d..58a707b3c0e4c1f1f72a986c0c93b16e69c1ffb1 100644 --- a/goofy-client/apps/goofy-e2e/Jenkinsfile +++ b/goofy-client/apps/goofy-e2e/Jenkinsfile @@ -189,7 +189,7 @@ pipeline { } } } - + stage('Pausing to wait for ozg-operator') { when { expression { !SKIP_RUN } @@ -371,13 +371,13 @@ String getFeatureBranchHelmChartVersion() { String getRootPomVersion() { def rootPom = readMavenPom file: 'pom.xml' - + return rootPom.version } Void initEnvPlutoDefaultVersions() { plutoValues = getApplicationValues("pluto") - + env.PLUTO_IMAGE_TAG = getImageTag(plutoValues) env.PLUTO_HELM_CHART_VERSION = getHelmChartVersion(plutoValues) env.PLUTO_HELM_REPO_URL = getHelmRepoUrl() @@ -385,7 +385,7 @@ Void initEnvPlutoDefaultVersions() { Void initEnvUserManagerDefaultVersions() { userManagerValues = getApplicationValues("user-manager") - + env.USER_MANAGER_IMAGE_TAG = getImageTag(userManagerValues) env.USER_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(userManagerValues) env.USER_MANAGER_HELM_REPO_URL = getHelmRepoUrl() @@ -490,7 +490,7 @@ List generateKeycloakUserForHelmChart() { List mapUserClientRoles(userClientRoles) { def clientRoles = [] - + for(clientRole in userClientRoles) { clientRoles.add(['name': "alfa", 'role': clientRole]) } @@ -623,7 +623,7 @@ String runTests(String bezeichner, String reportFolder, Integer dbPort, String s } } catch (Exception e) { printNpmDebugLog() - + error("Fehler in Stage ${stageName}") } } @@ -663,8 +663,10 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor dir('goofy-client/apps/goofy-e2e/'){ def config = readJSON file: 'cypress-ci.json' + def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace); + config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String - config.env.dbUrl = "mongodb://pluto-database-user:XnHhfznNWg65NNd@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String + config.env.dbUrl = "mongodb://pluto-database-user:${decodeString(plutoDatabaseSecret.password)}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String config.env.keycloakUrl = "https://${env.SSO_URL}/" as String config.env.keycloakRealm = namespace as String config.env.keycloakClient = "alfa" as String @@ -685,13 +687,22 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor return configName } +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(namespace); return [ - "dbUrl": "mongodb://user-manager-database-user:5M3N2sVEq5c8@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" ] } +Map getPlutoDatabaseUserManagerSecret(String namespace) { + return readJSON ( text: sh (script: "kubectl get secret pluto-database-admin-user-manager-database-user -n ${namespace} -o jsonpath={.data}", returnStdout: true)) +} + String getKeycloakUuid(realm, userName) { def shScript = """curl -H 'Content-Type: application/json' \ -H 'Authorization: bearer ${getKeycloakAccessToken()}' \