Merge pull request #102 from alecharp/features/skip-integration-tests…

…-if-required Removed integrations tests execution by default
jenkinsci · Nov 20, 2019 · 38f46ec · 38f46ec
2 parents fc0b8db + 0c299e9
commit 38f46ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -24,21 +24,18 @@ pipeline {
 
     stages {
         stage("Build and test") {
-	    agent {
-    	    	kubernetes {
-      		    cloud 'kubernetes'
-      		    label 'maven-pod'
-      		    yamlFile 'jenkins/maven-pod.yaml'
-		}
-	    }
-	    steps {
-	    	container('maven') {
+            agent {
+                kubernetes {
+                    cloud 'kubernetes'
+                    label 'maven-pod'
+                    yamlFile 'jenkins/maven-pod.yaml'
+                }
+            }
+            steps {
+                container('maven') {
                     withCredentials([[$class: 'StringBinding', credentialsId: env.GCS_IT_CRED_ID, variable: 'GOOGLE_CREDENTIALS']]) {
-		        // build
-	    	        sh "mvn clean package -ntp"
-
-		        // run tests
-		        sh "mvn verify -ntp"
+                        // build
+                        sh "mvn verify -ntp -DskipIts=false"
                     }
                 }
             }

diff --git a/pom.xml b/pom.xml
@@ -73,6 +73,7 @@
     <java.level>8</java.level>
     <pipeline-model-definition.version>1.3.8</pipeline-model-definition.version>
     <concurrency>5</concurrency>
+    <skipIts>true</skipIts>
     <fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
   </properties>
 
@@ -334,6 +335,7 @@
           </execution>
         </executions>
         <configuration>
+          <skipITs>${skipIts}</skipITs>
           <disableXmlReport>true</disableXmlReport>
           <useFile>false</useFile>
         </configuration>