From 2fffe952dffcf958c982d260ded3c5ead2b57dac Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 30 Sep 2024 12:01:56 +0200
Subject: [PATCH] add zufi-manager to e2e tests
---
alfa-client/apps/alfa-e2e/Jenkinsfile | 18 ++++++++++++++++++
.../src/fixtures/argocd/by-ea-dev.yaml | 5 +++++
.../src/fixtures/argocd/by-main-dev.yaml | 5 +++++
3 files changed, 28 insertions(+)
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 75c614b3a2..118e2ee893 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -101,6 +101,7 @@ pipeline {
initEnvAlfaDefaultVersions()
initEnvVorgangManagerDefaultVersions()
initEnvUserManagerDefaultVersions()
+ initEnvZufiManagerDefaultVersions()
initEnvZufiServerDefaultVersions()
}
}
@@ -129,6 +130,9 @@ pipeline {
string(name: "UserManagerImageTag", defaultValue: env.USER_MANAGER_IMAGE_TAG, trim: true),
string(name: "UserManagerHelmChartVersion", defaultValue: env.USER_MANAGER_HELM_CHART_VERSION, trim: true),
string(name: "UserManagerHelmRepoUrl", defaultValue: env.USER_MANAGER_HELM_REPO_URL, trim: true),
+ string(name: "ZufiManagerImageTag", defaultValue: env.ZUFI_MANAGER_IMAGE_TAG, trim: true),
+ string(name: "ZufiManagerHelmChartVersion", defaultValue: env.ZUFI_MANAGER_HELM_CHART_VERSION, trim: true),
+ string(name: "ZufiManagerHelmRepoUrl", defaultValue: env.ZUFI_MANAGER_HELM_REPO_URL, trim: true),
string(name: "ZufiServerImageTag", defaultValue: env.ZUFI_SERVER_IMAGE_TAG, trim: true),
string(name: "ZufiServerHelmChartVersion", defaultValue: env.ZUFI_SERVER_HELM_CHART_VERSION, trim: true),
string(name: "ZufiServerHelmRepoUrl", defaultValue: env.ZUFI_SERVER_HELM_REPO_URL, trim: true)
@@ -437,6 +441,14 @@ Void initEnvUserManagerDefaultVersions() {
env.USER_MANAGER_HELM_REPO_URL = getHelmRepoUrl()
}
+Void initEnvZufiManagerDefaultVersions() {
+ def values = getApplicationValues('zufi-manager')
+
+ env.ZUFI_MANAGER_IMAGE_TAG = getImageTag(values)
+ env.ZUFI_MANAGER_HELM_CHART_VERSION = getHelmChartVersion(values)
+ env.ZUFI_MANAGER_HELM_REPO_URL = getHelmRepoUrl()
+}
+
Void initEnvZufiServerDefaultVersions() {
def values = getApplicationValues('zufi-server')
@@ -455,6 +467,9 @@ Void initEnvUserVersions(userVersions) {
env.USER_MANAGER_IMAGE_TAG = userVersions.UserManagerImageTag
env.USER_MANAGER_HELM_CHART_VERSION = userVersions.UserManagerHelmChartVersion
env.USER_MANAGER_HELM_REPO_URL = userVersions.UserManagerHelmRepoUrl
+ env.ZUFI_MANAGER_IMAGE_TAG = userVersions.ZufiManagerImageTag
+ env.ZUFI_MANAGER_HELM_CHART_VERSION = userVersions.ZufiManagerHelmChartVersion
+ env.ZUFI_MANAGER_HELM_REPO_URL = userVersions.ZufiManagerHelmRepoUrl
env.ZUFI_SERVER_IMAGE_TAG = userVersions.ZufiServerImageTag
env.ZUFI_SERVER_HELM_CHART_VERSION = userVersions.ZufiServerHelmChartVersion
env.ZUFI_SERVER_HELM_REPO_URL = userVersions.ZufiServerHelmRepoUrl
@@ -506,6 +521,9 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix) {
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.zufi_manager.put("image", ['tag': env.ZUFI_MANAGER_IMAGE_TAG])
+ envValues.zufi_manager.put("helm", ['version': env.ZUFI_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.ZUFI_MANAGER_HELM_REPO_URL])
+
envValues.zufi_server.put("image", ['tag': env.ZUFI_SERVER_IMAGE_TAG])
envValues.zufi_server.put("helm", ['version': env.ZUFI_SERVER_HELM_CHART_VERSION, 'repoUrl': env.ZUFI_SERVER_HELM_REPO_URL])
}
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 cecb74fe99..20f4c49778 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
@@ -56,6 +56,11 @@ user_manager:
ingress:
use_staging_cert: true
+zufi_manager:
+ enabled: true
+ env:
+ overrideSpringProfiles: 'e2e'
+
zufi_server:
enabled: true
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 423025f933..82a8f2471c 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
@@ -55,6 +55,11 @@ user_manager:
ingress:
use_staging_cert: true
+zufi_manager:
+ enabled: true
+ env:
+ overrideSpringProfiles: 'e2e'
+
zufi_server:
enabled: true
--
GitLab