From acdd31c9dc00cef83889ef1b2ad43c1f30d3fe3f Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 25 Feb 2022 17:08:19 +0100
Subject: [PATCH] OZG-1889 use latest helmchart
---
Jenkinsfile | 4 ++--
.../wiedervorlage/wiedervorlage-authorize-by-role.e2e-spec.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 78b82c2fa0..aacd283660 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -344,7 +344,7 @@ Void startPluto(String namespace, String values) {
container("k8s") {
dir('goofy-client/apps/goofy-e2e/deployment-values/pluto') {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
- sh "helm upgrade --install --create-namespace pluto pluto --version 0.5.0-SNAPSHOT-ozg-2065 -f ${values} --namespace ${namespace}" + ' --repo https://nexus.ozg-sh.de/repository/ozg-base-apps-snapshot --username ${USER} --password ${PASSWORD} --wait --wait-for-jobs'
+ sh "helm upgrade --install --create-namespace pluto pluto -f ${values} --namespace ${namespace}" + ' --repo https://nexus.ozg-sh.de/repository/ozg-base-apps --username ${USER} --password ${PASSWORD} --wait --wait-for-jobs'
}
}
@@ -356,7 +356,7 @@ Void startGoofy(String namespace, String values, String imageTag) {
container("k8s") {
dir('goofy-client/apps/goofy-e2e/deployment-values/goofy') {
withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
- sh "helm upgrade --install --create-namespace goofy goofy --version 0.7.0-SNAPSHOT-ozg-2065 -f ${values} --set image.tag=${imageTag} --namespace ${namespace}" + ' --repo https://nexus.ozg-sh.de/repository/ozg-base-apps-snapshot --username ${USER} --password ${PASSWORD} --wait --wait-for-jobs'
+ sh "helm upgrade --install --create-namespace goofy goofy -f ${values} --set image.tag=${imageTag} --namespace ${namespace}" + ' --repo https://nexus.ozg-sh.de/repository/ozg-base-apps --username ${USER} --password ${PASSWORD} --wait --wait-for-jobs'
}
}
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage-authorize-by-role.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage-authorize-by-role.e2e-spec.ts
index a193e8f15c..401d39adfa 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage-authorize-by-role.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/wiedervorlage/wiedervorlage-authorize-by-role.e2e-spec.ts
@@ -9,7 +9,7 @@ import { loginAsPeter, UserRoleE2E } from 'apps/goofy-e2e/src/support/user-util'
import { buildVorgang, initVorgaenge } from 'apps/goofy-e2e/src/support/vorgang-util';
import { createWiedervorlageNeuUriByVorgangId } from 'apps/goofy-e2e/src/support/wiedervorlage-util';
-describe.skip('FIXME OZG-2065 Wiedervorlage should be authorized by role', () => {
+describe('Wiedervorlage should be authorized by role', () => {
const mainPage: MainPage = new MainPage();
const snackbar: SnackBarE2EComponent = mainPage.getSnackBar();
--
GitLab