From 77936dc39d5ae85221978418c457fc564bc37002 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 7 Jul 2023 14:33:08 +0200
Subject: [PATCH] ozg-3879 mongodb helmchart
---
goofy-client/apps/goofy-e2e/Jenkinsfile | 28 ++++++++++++-------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/Jenkinsfile b/goofy-client/apps/goofy-e2e/Jenkinsfile
index c7b01c3c89..2f286768c2 100644
--- a/goofy-client/apps/goofy-e2e/Jenkinsfile
+++ b/goofy-client/apps/goofy-e2e/Jenkinsfile
@@ -213,7 +213,7 @@ pipeline {
def bezeichner = env.EA_BEZEICHNER
def dbPort = 27018
- forwardServices(generateNamespace(bezeichner), dbPort, bezeichner)
+ forwardServices(generateNamespace(bezeichner), dbPort)
runTests(bezeichner, 'einheitlicher-ansprechpartner', dbPort, env.STAGE_NAME)
}
@@ -240,7 +240,7 @@ pipeline {
def bezeichner = env.MAIN_BEZEICHNER
def dbPort = 27019
- forwardServices(generateNamespace(bezeichner), dbPort, bezeichner)
+ forwardServices(generateNamespace(bezeichner), dbPort)
runTests(bezeichner, 'main-tests', dbPort, env.STAGE_NAME)
}
@@ -663,7 +663,7 @@ 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, bezeichner);
+ def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
def decodedPassword = decodeString(plutoDatabaseSecret.password);
def parsablePassword = makePasswordUrlConform(decodedPassword);
@@ -679,7 +679,7 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
config.reporterOptions.reportDir = "./reports/${testFolder}/mochawesome-report" as String
config.env.put("search", getElasticsearchEnv(namespace))
- config.env.put("userManager", getUserManagerEnv(namespace, dbPort, bezeichner))
+ config.env.put("userManager", getUserManagerEnv(namespace, dbPort))
writeJSON file: configName, json: config
@@ -693,12 +693,12 @@ String makePasswordUrlConform(String password) {
return sh (script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
}
-Map getPlutoDatabaseSecret(String namespace, String bezeichner) {
- return readJSON ( text: sh (script: "kubectl get secret ${bezeichner}-database-admin-pluto-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getPlutoDatabaseSecret(String namespace) {
+ return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-pluto-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
-Map getUserManagerEnv(String namespace, dbPort, String bezeichner){
- def userManagerDatabaseSecret = getUserManagerDatabaseSecret(namespace, bezeichner);
+Map getUserManagerEnv(String namespace, dbPort){
+ def userManagerDatabaseSecret = getUserManagerDatabaseSecret(namespace);
def decodedPassword = decodeString(userManagerDatabaseSecret.password);
def parsablePassword = makePasswordUrlConform(decodedPassword);
@@ -708,8 +708,8 @@ Map getUserManagerEnv(String namespace, dbPort, String bezeichner){
]
}
-Map getUserManagerDatabaseSecret(String namespace, String bezeichner) {
- return readJSON ( text: sh (script: "kubectl get secret ${bezeichner}-database-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
+Map getUserManagerDatabaseSecret(String namespace) {
+ return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-user-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
}
String getKeycloakUuid(realm, userName) {
@@ -784,9 +784,9 @@ Map getElasticsearchEnv(String namespace) {
]
}
-Void forwardServices(String namespace, Integer dbPort, String bezeichner) {
+Void forwardServices(String namespace, Integer dbPort) {
try {
- forwardDatenbank(namespace, dbPort, bezeichner)
+ forwardDatenbank(namespace, dbPort)
forwardElasticSearch()
}
catch (Exception e) {
@@ -805,8 +805,8 @@ Boolean isElasticSearchForwarded() {
return sh (script: "lsof -i -P -n | grep LISTEN | grep :9200", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
-Void forwardDatenbank(String namespace, port, String bezeichner) {
- sh "kubectl port-forward ${bezeichner}-database-0 ${port}:27017 -n ${namespace} &"
+Void forwardDatenbank(String namespace, port) {
+ sh "kubectl port-forward ozg-mongodb-0 ${port}:27017 -n ${namespace} &"
}
String generateNamespace(String bezeichner) {
--
GitLab