diff --git a/Jenkinsfile b/Jenkinsfile index 78b82c2fa0f7953440342be168c973cc9f3ceac9..aacd2836602d03d11b06595603b4cd0d1b429d39 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 a193e8f15c51fd6e2921042a296e5716bb4e6958..401d39adfab26d02d3c752ea772d34378fbf3028 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();