From f34830184857fdb9eecad6bab731494a9bdfc3d6 Mon Sep 17 00:00:00 2001 From: Martin <git@mail.de> Date: Tue, 25 Feb 2025 12:43:18 +0100 Subject: [PATCH] add alfa-client to Jenkinsfile for e2e --- alfa-client/Jenkinsfile.e2e | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e index 94fcdb5126..9cd84d22c5 100644 --- a/alfa-client/Jenkinsfile.e2e +++ b/alfa-client/Jenkinsfile.e2e @@ -129,6 +129,7 @@ pipeline { initEnvAdminDefaultVersions() initEnvAlfaDefaultVersions() + initEnvVorgangManagerDefaultVersions() initEnvUserManagerDefaultVersions() } @@ -152,6 +153,9 @@ pipeline { string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true), string(name: "AlfaHelmChartVersion", defaultValue: env.ALFA_HELM_CHART_VERSION, trim: true), string(name: "AlfaHelmRepoUrl", defaultValue: env.ALFA_HELM_REPO_URL, trim: true), + string(name: "AlfaClientImageTag", defaultValue: env.ALFA_CLIENT_IMAGE_TAG, trim: true), + string(name: "AlfaClientHelmChartVersion", defaultValue: env.ALFA_CLIENT_HELM_CHART_VERSION, trim: true), + string(name: "AlfaClientHelmRepoUrl", defaultValue: env.ALFA_CLIENT_HELM_REPO_URL, trim: true), string(name: "AdministrationImageTag", defaultValue: env.ADMINISTRATION_IMAGE_TAG, trim: true), string(name: "AdministrationHelmChartVersion", defaultValue: env.ADMINISTRATION_HELM_CHART_VERSION, trim: true), string(name: "AdministrationHelmRepoUrl", defaultValue: env.ADMINISTRATION_HELM_REPO_URL, trim: true), @@ -476,6 +480,12 @@ Void initEnvAlfaDefaultVersions() { env.ALFA_IMAGE_TAG = getImageTag(values) env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values) env.ALFA_HELM_REPO_URL = getHelmRepoUrl() + + values = getApplicationValues('alfa-client') + + env.ALFA_CLIENT_IMAGE_TAG = getImageTag(values) + env.ALFA_CLIENT_HELM_CHART_VERSION = getHelmChartVersion(values) + env.ALFA_CLIENT_HELM_REPO_URL = getHelmRepoUrl() } Void initEnvVorgangManagerDefaultVersions() { @@ -498,6 +508,9 @@ Void initEnvUserVersions(userVersions) { env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl + env.ALFA_CLIENT_IMAGE_TAG = userVersions.AlfaClientImageTag + env.ALFA_CLIENT_HELM_CHART_VERSION = userVersions.AlfaClientHelmChartVersion + env.ALFA_CLIENT_HELM_REPO_URL = userVersions.AlfaClientHelmRepoUrl env.ADMINISTRATION_IMAGE_TAG = userVersions.AdministrationImageTag env.ADMINISTRATION_HELM_CHART_VERSION = userVersions.AdministrationHelmChartVersion env.ADMINISTRATION_HELM_REPO_URL = userVersions.AdministrationHelmRepoUrl @@ -585,6 +598,9 @@ String generateNamespaceYaml(String bezeichner, String valuesPathSuffix) { 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.alfa_client.put("image", ['tag': env.ALFA_CLIENT_IMAGE_TAG]) + envValues.alfa_client.put("helm", ['version': env.ALFA_CLIENT_HELM_CHART_VERSION, 'repoUrl': env.ALFA_CLIENT_HELM_REPO_URL]) + 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]) -- GitLab