Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend-clients
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
frontend-clients
Commits
bddded26
Verified
Commit
bddded26
authored
3 months ago
by
Sebastian Bergandy
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
alfa-client/Jenkinsfile.e2e
+565
-553
565 additions, 553 deletions
alfa-client/Jenkinsfile.e2e
with
565 additions
and
553 deletions
alfa-client/Jenkinsfile.e2e
+
565
−
553
View file @
bddded26
...
@@ -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);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment