Skip to content
Snippets Groups Projects
Commit 33194536 authored by Martin's avatar Martin
Browse files

OZG-7952 rename e2e jenkinsfile

parent 777bf74b
Branches
Tags
No related merge requests found
...@@ -462,7 +462,7 @@ Void initEnvAdminDefaultVersions() { ...@@ -462,7 +462,7 @@ Void initEnvAdminDefaultVersions() {
env.ADMINISTRATION_HELM_CHART_VERSION = getHelmChartVersion(values) env.ADMINISTRATION_HELM_CHART_VERSION = getHelmChartVersion(values)
env.ADMINISTRATION_HELM_REPO_URL = getHelmRepoUrl() env.ADMINISTRATION_HELM_REPO_URL = getHelmRepoUrl()
values = getApplicationValues('admin-client') values = getApplicationValues('administration-client')
env.ADMIN_CLIENT_IMAGE_TAG = getImageTag(values) env.ADMIN_CLIENT_IMAGE_TAG = getImageTag(values)
env.ADMIN_CLIENT_HELM_CHART_VERSION = getHelmChartVersion(values) env.ADMIN_CLIENT_HELM_CHART_VERSION = getHelmChartVersion(values)
env.ADMIN_CLIENT_HELM_REPO_URL = getHelmRepoUrl() env.ADMIN_CLIENT_HELM_REPO_URL = getHelmRepoUrl()
...@@ -565,8 +565,8 @@ Void generateAdminNamespaceYaml() { ...@@ -565,8 +565,8 @@ Void generateAdminNamespaceYaml() {
envValues.administration.put("helm", ['version': env.ADMINISTRATION_HELM_CHART_VERSION, 'repoUrl': env.ADMINISTRATION_HELM_REPO_URL]) 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.administration.put("ozgcloud", ['feature': ['organisationsEinheiten': "true"], 'organisationEinheit': ['zufiSearchUri': generateZufiSearchUri(bezeichner)]])
envValues.admin_client.put("image", ['tag': env.ADMIN_CLIENT_IMAGE_TAG]) envValues.administration_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]) envValues.administration_client.put("helm", ['version': env.ADMIN_CLIENT_HELM_CHART_VERSION, 'repoUrl': env.ADMIN_CLIENT_HELM_REPO_URL])
} }
return writeYamlToGitOps(bezeichner, envValues); return writeYamlToGitOps(bezeichner, envValues);
} }
...@@ -657,7 +657,7 @@ Void waitForAlfaRollout(ozgCloudBezeichner) { ...@@ -657,7 +657,7 @@ Void waitForAlfaRollout(ozgCloudBezeichner) {
Void waitForAdminRollout(String bezeichner) { Void waitForAdminRollout(String bezeichner) {
waitForAlfaRollout([bezeichner]) waitForAlfaRollout([bezeichner])
waitForHealthyApplication(bezeichner, 'administration') waitForHealthyApplication(bezeichner, 'administration')
waitForHealthyApplication(bezeichner, 'admin-client') waitForHealthyApplication(bezeichner, 'administration-client')
} }
Void waitForAlfaRollout(String bezeichner) { Void waitForAlfaRollout(String bezeichner) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment