Skip to content
Snippets Groups Projects
Commit 731a67fa authored by OZGCloud's avatar OZGCloud
Browse files

OZG-1784 fail e2e test

parent 6b31dd0e
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ pipeline { ...@@ -13,7 +13,7 @@ pipeline {
BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/blue/organizations/jenkins/goofy/detail/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/pipeline" BLUE_OCEAN_URL = "https://jenkins.ozg-sh.de/blue/organizations/jenkins/goofy/detail/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/pipeline"
RELEASE_REGEX = /\d+.\d+.\d+/ RELEASE_REGEX = /\d+.\d+.\d+/
SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/ SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
E2E_FAILED = '' E2E_FAILED = ""
} }
options { options {
...@@ -103,7 +103,7 @@ pipeline { ...@@ -103,7 +103,7 @@ pipeline {
container("maven-17"){ container("maven-17"){
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
sh 'mvn --version' sh 'mvn --version'
sh 'mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install spring-boot:build-image -Dspring-boot.build-image.imageName=docker.ozg-sh.de/goofy:$IMAGE_TAG -Dspring-boot.build-image.publish -Dmaven.wagon.http.retryHandler.count=3' sh "mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install spring-boot:build-image -Dspring-boot.build-image.imageName=docker.ozg-sh.de/goofy:${IMAGE_TAG} -Dspring-boot.build-image.publish -Dmaven.wagon.http.retryHandler.count=3"
} }
try { try {
...@@ -163,9 +163,11 @@ pipeline { ...@@ -163,9 +163,11 @@ pipeline {
) )
if(runTests(stageName, 'einheitlicher-ansprechpartner') != '0') { if(runTests(stageName, 'einheitlicher-ansprechpartner') != '0') {
E2E_FAILED += "${stageName}, " env.E2E_FAILED += "${stageName}, "
} }
print(env.E2E_FAILED)
shutdownEnvironment(namespace) shutdownEnvironment(namespace)
} }
} }
...@@ -181,15 +183,15 @@ pipeline { ...@@ -181,15 +183,15 @@ pipeline {
]) ])
script { script {
println('post E2E-EA') if (env.E2E_FAILED) {
println(env.STAGE_NAME) if (env.E2E_FAILED.contains(env.STAGE_NAME)) {
if (E2E_FAILED.contains(env.STAGE_NAME)) {
currentBuild.result = 'FAILURE' currentBuild.result = 'FAILURE'
} }
} }
} }
} }
} }
}
stage('E2E-main') { stage('E2E-main') {
steps { steps {
script { script {
...@@ -208,9 +210,11 @@ pipeline { ...@@ -208,9 +210,11 @@ pipeline {
) )
if(runTests(stageName, 'main-tests') != '0') { if(runTests(stageName, 'main-tests') != '0') {
E2E_FAILED += "${stageName}, " env.E2E_FAILED += "${stageName}, "
} }
print(env.E2E_FAILED)
shutdownEnvironment(namespace) shutdownEnvironment(namespace)
} }
} }
...@@ -226,21 +230,21 @@ pipeline { ...@@ -226,21 +230,21 @@ pipeline {
]) ])
script { script {
println('post E2E-main') if (env.E2E_FAILED) {
println(env.STAGE_NAME) if (env.E2E_FAILED.contains(env.STAGE_NAME)) {
if (E2E_FAILED.contains(env.STAGE_NAME)) {
currentBuild.result = 'FAILURE' currentBuild.result = 'FAILURE'
} }
} }
} }
} }
} }
}
} }
post { post {
always { always {
script { script {
if (E2E_FAILED) { if (env.E2E_FAILED) {
FAILED_STAGE = "E2E (${E2E_FAILED.substring(0, E2E_FAILED.length() - 2)})" FAILED_STAGE = "E2E (${env.E2E_FAILED.substring(0, env.E2E_FAILED.length() - 2)})"
} }
} }
} }
......
...@@ -41,7 +41,7 @@ describe('Vorgang abschliessen', () => { ...@@ -41,7 +41,7 @@ describe('Vorgang abschliessen', () => {
describe('by button', () => { describe('by button', () => {
it('should have status Beschieden', () => { it('should have status Beschieden', () => {
haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessen.status]); haveText(vorgangPage.getVorgangDetailHeader().getStatus(), "Fail Test");
}) })
it('should show snackBar message', () => { it('should show snackBar message', () => {
......
...@@ -41,7 +41,7 @@ describe('Vorgang abschliessen(EA)', () => { ...@@ -41,7 +41,7 @@ describe('Vorgang abschliessen(EA)', () => {
describe('by button', () => { describe('by button', () => {
it('should have status Beschieden', () => { it('should have status Beschieden', () => {
haveText(vorgangPage.getVorgangDetailHeader().getStatus(), vorgangStatusLabelE2E[vorgangAbschliessen.status]); haveText(vorgangPage.getVorgangDetailHeader().getStatus(), "Fail Test");
}) })
it('should show snackBar message', () => { it('should show snackBar message', () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment