From 3b32a90824102a1124a5c05f388de8898363e66b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 28 Nov 2023 10:52:23 +0100
Subject: [PATCH] OZG-4591 revert gitOps related namings; revert database name
---
Jenkinsfile | 9 +++++----
alfa-client/apps/alfa-e2e/Jenkinsfile | 18 +++++++++---------
alfa-client/apps/alfa-e2e/cypress-ci.json | 2 +-
.../src/fixtures/argocd/by-ea-dev.yaml | 2 +-
.../src/fixtures/argocd/by-main-dev.yaml | 2 +-
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b5fcab68e2..bc26f4d719 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -349,12 +349,12 @@ Void setNewTestVersion() {
Void setNewGitopsVersion(String environment) {
dir("gitops") {
- def envFile = "${environment}/application/values/alfa-values.yaml"
+ def envFile = "${environment}/application/values/goofy-values.yaml"//TODO OZG-4591
def envVersions = readYaml file: envFile
- envVersions.alfa.image.tag = IMAGE_TAG
- envVersions.alfa.helm.version = HELM_CHART_VERSION
+ envVersions.goofy.image.tag = IMAGE_TAG//TODO OZG-4591
+ envVersions.goofy.helm.version = HELM_CHART_VERSION//TODO OZG-4591
writeYaml file: envFile, data: envVersions, overwrite: true
@@ -366,7 +366,8 @@ Void setNewGitopsVersion(String environment) {
}
Boolean hasValuesFileChanged(String environment) {
- return sh (script: "git status | grep '${environment}/application/values/alfa-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+ //TODO OZG-4591
+ return sh (script: "git status | grep '${environment}/application/values/goofy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
Boolean isReleaseBranch() {
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 8b710e876a..bab2b4fb8f 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -358,7 +358,7 @@ String getHelmChartVersion(Map applicationValues) {
Void initEnvAlfaDefaultVersions() {
if (isMasterBranch() || isReleaseBranch()) {
- values = getApplicationValues('alfa')
+ values = getApplicationValues('goofy')//TODO OZG-4591
env.ALFA_IMAGE_TAG = getImageTag(values)
env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -394,7 +394,7 @@ String getRootPomVersion() {
}
Void initEnvVorgangManagerDefaultVersions() {
- values = getApplicationValues('vorgang-manager')
+ values = getApplicationValues('pluto')//TODO OZG-4591
env.VORGANG_MANAGER_IMAGE_TAG = getImageTag(values)
env.VORGANG_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
@@ -454,18 +454,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.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.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.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.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.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.alfa.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
- envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
+ envValues.goofy.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())//TODO OZG-4591
+ envValues.goofy.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))//TODO OZG-4591
writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
diff --git a/alfa-client/apps/alfa-e2e/cypress-ci.json b/alfa-client/apps/alfa-e2e/cypress-ci.json
index 2659928079..084a420ec7 100644
--- a/alfa-client/apps/alfa-e2e/cypress-ci.json
+++ b/alfa-client/apps/alfa-e2e/cypress-ci.json
@@ -1,6 +1,6 @@
{
"env": {
- "database": "vorgang-manager-database",
+ "database": "pluto-database",
"keycloakClient": "alfa"
},
"fileServerFolder": ".",
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
index 24540910a7..f89d4e21f8 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml
@@ -21,7 +21,7 @@ alfa:
className: openshift-default
baseUrl: dev.by.ozg-cloud.de
-vorgang-manager:
+pluto:
env:
overrideSpringProfiles: "oc,e2e,dev"
elasticsearch:
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
index d079ae0db5..4bb08d8692 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -17,7 +17,7 @@ alfa:
className: openshift-default
baseUrl: dev.by.ozg-cloud.de
-vorgang-manager:
+pluto:
env:
overrideSpringProfiles: "oc,e2e,dev"
elasticsearch:
--
GitLab