From 41655fb62423aa3e89e871c2ee3693dfab2e334e Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Fri, 3 Jan 2025 13:47:56 +0100
Subject: [PATCH] OZG-6932 adjust image tag for feature branches
---
alfa-client/Jenkinsfile.e2e | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e
index 03f59d67bf..90e74ab59f 100644
--- a/alfa-client/Jenkinsfile.e2e
+++ b/alfa-client/Jenkinsfile.e2e
@@ -453,14 +453,6 @@ String getHelmRepoUrl() {
return "https://nexus.ozg-sh.de/repository/ozg-base-apps-snapshot"
}
-String getFeatureBranchImageTag() {
- return "${env.BRANCH_NAME}-${getRootPomVersion()}"
-}
-
-String getFeatureBranchHelmChartVersion() {
- return "${getRootPomVersion()}-${env.BRANCH_NAME}".replaceAll("_", "-")
-}
-
String getRootPomVersion() {
def rootPom = readMavenPom file: 'pom.xml'
@@ -480,18 +472,11 @@ Void initEnvAdminDefaultVersions() {
}
Void initEnvAlfaDefaultVersions() {
- if (isMasterBranch() || isReleaseBranch()) {
- values = getApplicationValues('alfa')
+ def values = getApplicationValues('alfa')
env.ALFA_IMAGE_TAG = getImageTag(values)
env.ALFA_HELM_CHART_VERSION = getHelmChartVersion(values)
- }
- else {
- env.ALFA_IMAGE_TAG = getFeatureBranchImageTag()
- env.ALFA_HELM_CHART_VERSION = getFeatureBranchHelmChartVersion()
- }
-
- env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
+ env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
}
Void initEnvVorgangManagerDefaultVersions() {
--
GitLab