From eb8033764974f675367937c027a484e5d72140b1 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Wed, 15 Jan 2025 11:46:14 +0100
Subject: [PATCH] OZG-6741 configure ZufiSearchUri for e2e
---
alfa-client/Jenkinsfile.e2e | 5 +++++
.../apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml | 2 ++
2 files changed, 7 insertions(+)
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index a662c618cc..94fcdb5126 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -556,6 +556,7 @@ Void generateAdminNamespaceYaml() {
envValues.ozgcloud.bezeichner = bezeichner
envValues.administration.put("image", ['tag': env.ADMINISTRATION_IMAGE_TAG])
envValues.administration.put("helm", ['version': env.ADMINISTRATION_HELM_CHART_VERSION, 'repoUrl': env.ADMINISTRATION_HELM_REPO_URL])
+ envValues.administration.put("ozgcloud", ['feature': ['organisationsEinheiten' : "true"], 'organisationEinheit': ['zufiSearchUri': generateZufiSearchUri(bezeichner)]])
envValues.admin_client.put("image", ['tag': env.ADMIN_CLIENT_IMAGE_TAG])
envValues.admin_client.put("helm", ['version': env.ADMIN_CLIENT_HELM_CHART_VERSION, 'repoUrl': env.ADMIN_CLIENT_HELM_REPO_URL])
@@ -563,6 +564,10 @@ Void generateAdminNamespaceYaml() {
return writeYamlToGitOps(bezeichner, envValues);
}
+String generateZufiSearchUri(String bezeichner) {
+ return "https://${bezeichner}.dev.by.ozg-cloud.de/api/organisationseinheits?searchBy={searchBy}"
+}
+
String generateEaNamespaceYaml() {
return generateNamespaceYaml(env.EA_BEZEICHNER, "by-ea-dev.yaml");
}
diff --git a/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml b/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml
index dadb3ca3eb..cebf220d95 100644
--- a/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml
+++ b/alfa-client/apps/admin-e2e/src/fixtures/argocd/by-admin-dev.yaml
@@ -33,6 +33,8 @@ project:
administration:
enabled: true
+ env:
+ overrideSpringProfiles: 'oc,e2e,dev'
sso:
keycloak_users:
- name: ariane
--
GitLab