Skip to content
Snippets Groups Projects
Commit 6669b3f9 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into ozg-1784

parents e4041a47 7f883039
No related branches found
No related tags found
No related merge requests found
...@@ -103,13 +103,12 @@ pipeline { ...@@ -103,13 +103,12 @@ pipeline {
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 {
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'master') {
dir('goofy-server'){ dir('goofy-server'){
withSonarQubeEnv('sonarqube-ozg-sh'){ withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn sonar:sonar' sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
} }
} }
} }
...@@ -119,6 +118,7 @@ pipeline { ...@@ -119,6 +118,7 @@ pipeline {
} }
} }
} }
}
post { post {
always{ always{
junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
......
...@@ -56,7 +56,7 @@ describe('Kommentar user profile on backend error', () => { ...@@ -56,7 +56,7 @@ describe('Kommentar user profile on backend error', () => {
}) })
}) })
describe('on status 503', () => { describe.skip('on status 503', () => {
it('should manipulate response on vorgang detail navigation', () => { it('should manipulate response on vorgang detail navigation', () => {
interceptWithResponse(HttpMethodE2E.GET, '/api/userProfiles/*', { statusCode: 503, body: { issues: [{ messageCode: MessageCodeE2E.SERVICE_UNAVAILABLE }] } }); interceptWithResponse(HttpMethodE2E.GET, '/api/userProfiles/*', { statusCode: 503, body: { issues: [{ messageCode: MessageCodeE2E.SERVICE_UNAVAILABLE }] } });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment