Merge pull request payara#6944 from astoica1/FISH-9332-update-cargotr…

…acker FISH-9332: use a new branch for Cargotracker
Pandrex247 · Sep 16, 2024 · a2bfc8e · a2bfc8e
1 parent e873b39
commit a2bfc8e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -86,6 +86,7 @@ pipeline {
                         }
                     }
                 }
+<<<<<<< HEAD
 //                 stage('Payara Samples Tests') {
 //                     agent {
 //                         label 'general-purpose'
@@ -198,10 +199,10 @@ pipeline {
 //                         sh "rm -rf /tmp/cargo*"
 //
 //                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Running test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
-//                         sh """mvn -B -V -ff -e clean install --strict-checksums -Dsurefire.useFile=false \
-//                         -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
-//                         -Djavax.xml.accessExternalSchema=all -Dpayara.version=${pom.version} \
-//                         -Ppayara-server-remote -DtrimStackTrace=false"""
+//                         sh  """mvn -B -V -ff -e clean verify --strict-checksums -Dsurefire.useFile=false \
+//                          -Djavax.net.ssl.trustStore=${env.JAVA_HOME}/lib/security/cacerts \
+//                          -Djavax.xml.accessExternalSchema=all \
+//                          -Ppayara-server-remote -DtrimStackTrace=false"""
 //                         echo '*#*#*#*#*#*#*#*#*#*#*#*#  Ran test  *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#'
 //                     }
 //                     post {