Skip to content
Snippets Groups Projects
Verified Commit bddded26 authored by Sebastian Bergandy's avatar Sebastian Bergandy :keyboard:
Browse files

add alfa client version to e2e

Add possibility to set alfa client image version for e2e tests run.
parent 4a9d48e7
No related branches found
No related tags found
No related merge requests found
...@@ -129,6 +129,7 @@ pipeline { ...@@ -129,6 +129,7 @@ pipeline {
initEnvAdminDefaultVersions() initEnvAdminDefaultVersions()
initEnvAlfaDefaultVersions() initEnvAlfaDefaultVersions()
initEnvAlfaClientDefaultVersion()
initEnvVorgangManagerDefaultVersions() initEnvVorgangManagerDefaultVersions()
initEnvUserManagerDefaultVersions() initEnvUserManagerDefaultVersions()
} }
...@@ -150,6 +151,7 @@ pipeline { ...@@ -150,6 +151,7 @@ pipeline {
userVersions = input message: "Edit Default Values", userVersions = input message: "Edit Default Values",
parameters: [ parameters: [
string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true), string(name: "AlfaImageTag", defaultValue: env.ALFA_IMAGE_TAG, trim: true),
string(name: "AlfaClientImageTag", defaultValue: env.ALFA_CLIENT_IMAGE_TAG, trim: true),
string(name: "AlfaHelmChartVersion", defaultValue: env.ALFA_HELM_CHART_VERSION, 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: "AlfaHelmRepoUrl", defaultValue: env.ALFA_HELM_REPO_URL, trim: true),
string(name: "AdministrationImageTag", defaultValue: env.ADMINISTRATION_IMAGE_TAG, trim: true), string(name: "AdministrationImageTag", defaultValue: env.ADMINISTRATION_IMAGE_TAG, trim: true),
...@@ -478,6 +480,14 @@ Void initEnvAlfaDefaultVersions() { ...@@ -478,6 +480,14 @@ Void initEnvAlfaDefaultVersions() {
env.ALFA_HELM_REPO_URL = getHelmRepoUrl() env.ALFA_HELM_REPO_URL = getHelmRepoUrl()
} }
Void initEnvAlfaClientDefaultVersion() {
def 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() { Void initEnvVorgangManagerDefaultVersions() {
def values = getApplicationValues('vorgang-manager') def values = getApplicationValues('vorgang-manager')
...@@ -496,6 +506,7 @@ Void initEnvUserManagerDefaultVersions() { ...@@ -496,6 +506,7 @@ Void initEnvUserManagerDefaultVersions() {
Void initEnvUserVersions(userVersions) { Void initEnvUserVersions(userVersions) {
env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag env.ALFA_IMAGE_TAG = userVersions.AlfaImageTag
env.ALFA_CLIENT_IMAGE_TAG = userVersions.AlfaClientImageTag
env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion env.ALFA_HELM_CHART_VERSION = userVersions.AlfaHelmChartVersion
env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl env.ALFA_HELM_REPO_URL = userVersions.AlfaHelmRepoUrl
env.ADMINISTRATION_IMAGE_TAG = userVersions.AdministrationImageTag env.ADMINISTRATION_IMAGE_TAG = userVersions.AdministrationImageTag
...@@ -585,6 +596,9 @@ String generateNamespaceYaml(String bezeichner, String valuesPathSuffix) { ...@@ -585,6 +596,9 @@ String generateNamespaceYaml(String bezeichner, String valuesPathSuffix) {
envValues.alfa.put("image", ['tag': env.ALFA_IMAGE_TAG]) 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.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("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]) envValues.vorgang_manager.put("helm", ['version': env.VORGANG_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.VORGANG_MANAGER_HELM_REPO_URL])
...@@ -728,8 +742,7 @@ String runTests(String bezeichner, String appName, String appVariant, String key ...@@ -728,8 +742,7 @@ String runTests(String bezeichner, String appName, String appVariant, String key
Void printNpmDebugLog() { Void printNpmDebugLog() {
if (hasNpmDebugLog()) { if (hasNpmDebugLog()) {
sh "cat pnpm-debug.log" sh "cat pnpm-debug.log"
} } else {
else {
echo "pnpm debug log not found" echo "pnpm debug log not found"
} }
} }
...@@ -795,7 +808,6 @@ String generateUrlBezeichner(String bezeichner, String appName){ ...@@ -795,7 +808,6 @@ String generateUrlBezeichner(String bezeichner, String appName){
} }
String makePasswordUrlConform(String password) { String makePasswordUrlConform(String password) {
return sh(script: "printf %s ${password} | jq -sRr @uri", returnStdout: true); return sh(script: "printf %s ${password} | jq -sRr @uri", returnStdout: true);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment