OZG-4561 OZG-4565 adjust gitOps related things in Jenkinsfile(pluto ->...

OZG-4561 OZG-4565 adjust gitOps related things in Jenkinsfile(pluto -> vorgang-manager; goofy -> alfa)

Jenkinsfile

@@ -241,10 +241,10 @@ pipeline {
 Void deployHelmChart(String helmChartVersion) {
     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
         if (isReleaseBranch()) {
-            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@goofy-'''+helmChartVersion+'''.tgz''', returnStdout: true
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@alfa-'''+helmChartVersion+'''.tgz''', returnStdout: true
         }
         else {
-            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@goofy-'''+helmChartVersion+'''.tgz''', returnStdout: true
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@alfa-'''+helmChartVersion+'''.tgz''', returnStdout: true
         }
 
         if (result != '') {
@@ -349,12 +349,12 @@ Void setNewTestVersion() {
 
 Void setNewGitopsVersion(String environment) {
     dir("gitops") {
-        def envFile = "${environment}/application/values/goofy-values.yaml"//TODO OZG-4591
+        def envFile = "${environment}/application/values/alfa-values.yaml"
 
         def envVersions = readYaml file: envFile
 
-        envVersions.goofy.image.tag = IMAGE_TAG//TODO OZG-4591
-        envVersions.goofy.helm.version = HELM_CHART_VERSION//TODO OZG-4591
+        envVersions.alfa.image.tag = IMAGE_TAG
+        envVersions.alfa.helm.version = HELM_CHART_VERSION
 
         writeYaml file: envFile, data: envVersions, overwrite: true
 
@@ -366,8 +366,7 @@ Void setNewGitopsVersion(String environment) {
 }
 
 Boolean hasValuesFileChanged(String environment) {
-    //TODO OZG-4591
-    return sh (script: "git status | grep '${environment}/application/values/goofy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+    return sh (script: "git status | grep '${environment}/application/values/alfa-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Boolean isReleaseBranch() {

alfa-client/apps/alfa-e2e/Jenkinsfile

@@ -359,7 +359,7 @@ String getHelmChartVersion(Map applicationValues) {
 
 Void initEnvAlfaDefaultVersions() {
     if (isMasterBranch() || isReleaseBranch()) {
-        values = getApplicationValues('goofy')//TODO OZG-4591
+        values = getApplicationValues('alfa')
 
         env.ALFA_IMAGE_TAG = getImageTag(values)
         env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -395,7 +395,7 @@ String getRootPomVersion() {
 }
 
 Void initEnvVorgangManagerDefaultVersions() {
-    values = getApplicationValues('pluto')//TODO OZG-4591
+    values = getApplicationValues('vorgang-manager')
 
     env.VORGANG_MANAGER_IMAGE_TAG = getImageTag(values)
     env.VORGANG_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -455,18 +455,18 @@ Void generateMainNamespaceYaml() {
 Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String userFolder) {
     def envValues = readYaml file: "alfa-client/apps/alfa-e2e/src/fixtures/argocd/" + valuesPathSuffix;
 
-    envValues.kop.bezeichner = bezeichner//TODO OZG-4591
-    envValues.goofy.put("image", ['tag': env.ALFA_IMAGE_TAG])//TODO OZG-4591
-    envValues.goofy.put("helm", ['version': env.ALFA_HELM_CHART_VERSION, 'repoUrl': env.ALFA_HELM_REPO_URL])//TODO OZG-4591
+    envValues.ozgcloud.bezeichner = bezeichner
+    envValues.alfa.put("image", ['tag': env.ALFA_IMAGE_TAG])
+    envValues.alfa.put("helm", ['version': env.ALFA_HELM_CHART_VERSION, 'repoUrl': env.ALFA_HELM_REPO_URL])
 
-    envValues.pluto.put("image", ['tag': env.VORGANG_MANAGER_IMAGE_TAG])//TODO OZG-4591
-    envValues.pluto.put("helm", ['version': env.VORGANG_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.VORGANG_MANAGER_HELM_REPO_URL])//TODO OZG-4591
+    envValues.vorgang-manager.put("image", ['tag': env.VORGANG_MANAGER_IMAGE_TAG])
+    envValues.vorgang-manager.put("helm", ['version': env.VORGANG_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.VORGANG_MANAGER_HELM_REPO_URL])
 
     envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG])
     envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
 
-    envValues.goofy.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())//TODO OZG-4591
-    envValues.goofy.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))//TODO OZG-4591
+    envValues.alfa.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
+    envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
 
     writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
 

alfa-client/apps/alfa-e2e/Jenkinsfile-static

@@ -108,7 +108,7 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
 
-					updateGoofyToCurrentMaster();
+					updateAlfaToCurrentMaster();
 					pushGitopsRepo();
                 }
             }
@@ -256,8 +256,8 @@ def cloneGitopsRepo() {
     }
 }
 
-Void updateGoofyToCurrentMaster() {
-	def values = getApplicationValues('goofy');
+Void updateAlfaToCurrentMaster() {
+	def values = getApplicationValues('alfa');
 	def imageTag = getImageTag(values);
 	def helmVersion = getHelmVersion(values);
 
@@ -291,8 +291,8 @@ String getHelmVersion(Map applicationValues) {
 Void updateNamespaceYaml(String namespace, imageTag, helmVersion){
 	def namespaceYaml = readYaml file: "gitops/dev/namespace/namespaces/${namespace}.yaml";
 
-	namespaceYaml.goofy.image.put('tag', imageTag);
-	namespaceYaml.goofy.helm.put('version', helmVersion);
+	namespaceYaml.alfa.image.put('tag', imageTag);
+	namespaceYaml.alfa.helm.put('version', helmVersion);
 
 	writeYaml file: "gitops/dev/namespace/namespaces/${namespace}.yaml", data: namespaceYaml, overwrite: true
 
@@ -377,12 +377,12 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
     dir('alfa-client/apps/alfa-e2e/'){
         def config = readJSON file: 'cypress-ci.json'
 
-        def plutoDatabaseSecret = getPlutoDatabaseSecret(namespace);
-        def decodedPassword = decodeString(plutoDatabaseSecret.password);
+        def vorgangManagerDatabaseSecret = getVorgangManagerDatabaseSecret(namespace);
+        def decodedPassword = decodeString(vorgangManagerDatabaseSecret.password);
         def parsablePassword = makePasswordUrlConform(decodedPassword);
 
         config.baseUrl = "https://${bezeichner}.${env.CLUSTER_BASE_URL}" as String
-        config.env.dbUrl = "mongodb://${decodeString(plutoDatabaseSecret.username)}:${parsablePassword}@localhost:${dbPort}/admin?ssl=false&directConnection=true" as String
+        config.env.dbUrl = "mongodb://${decodeString(vorgangManagerDatabaseSecret.username)}:${parsablePassword}@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.sabineUuid = getKeycloakUuid(namespace, "sabine") as String
@@ -403,8 +403,8 @@ String generateCypressConfig(String bezeichner, String testFolder, Integer dbPor
     return "cypress-ci-"+testFolder+".config.ts"
 }
 
-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 getVorgangManagerDatabaseSecret(String namespace) {
+    return readJSON ( text: sh (script: "kubectl get secret ozg-mongodb-admin-vorgang-manager-user -n ${namespace} -o jsonpath={.data}", returnStdout: true))
 }
 
 Map getUserManagerEnv(String namespace, dbPort){