diff --git a/alfa-client/Jenkinsfile.e2e b/alfa-client/Jenkinsfile.e2e index 03f59d67bfb6e2786d81aa2142206543d2f13088..90e74ab59f74860179904bcd75ed0af6138daee4 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() {