diff --git a/Jenkinsfile b/Jenkinsfile index b5fcab68e2d84dad1ed93df13b876c5c033e2423..bc26f4d719833a2d1a20992adc2b524f4582d187 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 8b710e876a3523e554fb60f6d6fe4d92880dfab8..bab2b4fb8fd3cd80682fbc2ced17daa5940a361d 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 26599280794ad6d4a2eaf8ba98627211956e814d..084a420ec79ba1ddf02340bfe17f62db94a8b985 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 24540910a742ce8c680c70a8a33a2ead1b795a8f..f89d4e21f82e8656ff63d6f4c594dfd28cec2d37 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 d079ae0db5b7beb4a75b232b2177d39528633756..4bb08d8692675304ae1557eafe14a1909ef9733b 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: