Skip to content
Snippets Groups Projects
Commit 2fffe952 authored by OZGCloud's avatar OZGCloud
Browse files

add zufi-manager to e2e tests

parent 23d3ccd2
No related branches found
No related tags found
No related merge requests found
...@@ -101,6 +101,7 @@ pipeline { ...@@ -101,6 +101,7 @@ pipeline {
initEnvAlfaDefaultVersions() initEnvAlfaDefaultVersions()
initEnvVorgangManagerDefaultVersions() initEnvVorgangManagerDefaultVersions()
initEnvUserManagerDefaultVersions() initEnvUserManagerDefaultVersions()
initEnvZufiManagerDefaultVersions()
initEnvZufiServerDefaultVersions() initEnvZufiServerDefaultVersions()
} }
} }
...@@ -129,6 +130,9 @@ pipeline { ...@@ -129,6 +130,9 @@ pipeline {
string(name: "UserManagerImageTag", defaultValue: env.USER_MANAGER_IMAGE_TAG, trim: true), 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: "UserManagerHelmChartVersion", defaultValue: env.USER_MANAGER_HELM_CHART_VERSION, trim: true),
string(name: "UserManagerHelmRepoUrl", defaultValue: env.USER_MANAGER_HELM_REPO_URL, 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: "ZufiServerImageTag", defaultValue: env.ZUFI_SERVER_IMAGE_TAG, trim: true),
string(name: "ZufiServerHelmChartVersion", defaultValue: env.ZUFI_SERVER_HELM_CHART_VERSION, 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) string(name: "ZufiServerHelmRepoUrl", defaultValue: env.ZUFI_SERVER_HELM_REPO_URL, trim: true)
...@@ -437,6 +441,14 @@ Void initEnvUserManagerDefaultVersions() { ...@@ -437,6 +441,14 @@ Void initEnvUserManagerDefaultVersions() {
env.USER_MANAGER_HELM_REPO_URL = getHelmRepoUrl() 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() { Void initEnvZufiServerDefaultVersions() {
def values = getApplicationValues('zufi-server') def values = getApplicationValues('zufi-server')
...@@ -455,6 +467,9 @@ Void initEnvUserVersions(userVersions) { ...@@ -455,6 +467,9 @@ Void initEnvUserVersions(userVersions) {
env.USER_MANAGER_IMAGE_TAG = userVersions.UserManagerImageTag env.USER_MANAGER_IMAGE_TAG = userVersions.UserManagerImageTag
env.USER_MANAGER_HELM_CHART_VERSION = userVersions.UserManagerHelmChartVersion env.USER_MANAGER_HELM_CHART_VERSION = userVersions.UserManagerHelmChartVersion
env.USER_MANAGER_HELM_REPO_URL = userVersions.UserManagerHelmRepoUrl 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_IMAGE_TAG = userVersions.ZufiServerImageTag
env.ZUFI_SERVER_HELM_CHART_VERSION = userVersions.ZufiServerHelmChartVersion env.ZUFI_SERVER_HELM_CHART_VERSION = userVersions.ZufiServerHelmChartVersion
env.ZUFI_SERVER_HELM_REPO_URL = userVersions.ZufiServerHelmRepoUrl env.ZUFI_SERVER_HELM_REPO_URL = userVersions.ZufiServerHelmRepoUrl
...@@ -506,6 +521,9 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix) { ...@@ -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("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.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("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]) envValues.zufi_server.put("helm", ['version': env.ZUFI_SERVER_HELM_CHART_VERSION, 'repoUrl': env.ZUFI_SERVER_HELM_REPO_URL])
} }
......
...@@ -56,6 +56,11 @@ user_manager: ...@@ -56,6 +56,11 @@ user_manager:
ingress: ingress:
use_staging_cert: true use_staging_cert: true
zufi_manager:
enabled: true
env:
overrideSpringProfiles: 'e2e'
zufi_server: zufi_server:
enabled: true enabled: true
......
...@@ -55,6 +55,11 @@ user_manager: ...@@ -55,6 +55,11 @@ user_manager:
ingress: ingress:
use_staging_cert: true use_staging_cert: true
zufi_manager:
enabled: true
env:
overrideSpringProfiles: 'e2e'
zufi_server: zufi_server:
enabled: true enabled: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment