diff --git a/Jenkinsfile b/Jenkinsfile index c4b3d95b627f0dd4a29787b6aa0f8223d04ddc6c..d6819e5cac43482fdd4701a1a06d298555e55806 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { node { - label 'jenkins-quarkus-build-agent' + label 'ozgcloud-jenkins-build-agent' } } @@ -63,7 +63,7 @@ pipeline { } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { - sh './mvnw -pl user-manager-interface -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3' + sh 'mvn -pl user-manager-interface -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3' } } } @@ -74,7 +74,7 @@ pipeline { FAILED_STAGE=env.STAGE_NAME configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { - sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3' + sh 'mvn -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3' junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true } } @@ -88,7 +88,7 @@ pipeline { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { - sh './mvnw -pl user-manager-server -s $MAVEN_SETTINGS clean verify -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -Dquarkus.container-image.build=true -Dquarkus.native.remote-container-build=true -Dmaven.wagon.http.retryHandler.count=3' + sh 'mvn -pl user-manager-server -s $MAVEN_SETTINGS clean verify -Pnative -Dquarkus.container-image.registry=docker.ozg-sh.de -Dquarkus.container-image.username=${USER} -Dquarkus.container-image.password=${PASSWORD} -Dquarkus.container-image.push=true -Dquarkus.container-image.build=true -Dquarkus.native.remote-container-build=true -Dmaven.wagon.http.retryHandler.count=3' } } } @@ -96,9 +96,6 @@ pipeline { } stage ('OWASP Dependency-Check Vulnerabilities') { - when { - branch 'master' - } steps { dependencyCheck additionalArguments: ''' -o "./" @@ -107,6 +104,7 @@ pipeline { -d /dependency-check-data --suppression dependency-check-supressions.xml --disableKnownExploited + --noupdate --disableArchive --prettyPrint''', odcInstallation: 'dependency-check-owasp' @@ -126,7 +124,7 @@ pipeline { dir('user-manager-server') { try { withSonarQubeEnv('sonarqube-ozg-sh'){ - sh "./mvnw -s $MAVEN_SETTINGS package sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=${env.WORKSPACE}/user-manager-server/target/jacoco-report/jacoco.xml" + sh "mvn -s $MAVEN_SETTINGS package sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=${env.WORKSPACE}/user-manager-server/target/jacoco-report/jacoco.xml" } } catch (Exception e) { unstable("SonarQube failed")