Merge pull request #2190 from amazeeio/testing/jenkinsfile

improve branch existence test for skip-openshift label
uselagoon · Sep 9, 2020 · f008232 · f008232
2 parents 099617c + a6ab7f2
commit f008232
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -79,7 +79,7 @@ node {
               }
               stage ('minishift tests') {
                 try {
-                  if (pullRequest.labels.contains("skip-openshift-tests")) {
+                  if (env.CHANGE_ID && pullRequest.labels.contains("skip-openshift-tests")) {
                     sh script: 'echo "PR identified as not needing Openshift testing."', label: "Skipping Openshift testing stage"
                   } else {
                     sh 'make minishift/cleanall || echo'