Disable offline jobs for failing deploy scenarios

Change-Id: I40fbf28a6bc7bf41c487e11fd03f3b9d78c898a6

diff --git a/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml b/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
index 0262fee534b421031997f070a3e9b6f1e4cc2ac3..223597f02bcfed8a473a88aab0752b0f2a7d09f1 100644 (file)
--- a/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
+++ b/jjb/cloud-infra/kubernetes-jobs/kubernetes-verify-deploy-test.yaml
@@ -295,6 +295,8 @@
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/change.properties
+              enable-condition:
+                !include-raw: '../scripts/k8s-job-enable-condition.gvy'
       - multijob:
           name: "{environment-type} testing on {type} instances"
           condition: SUCCESSFUL
@@ -307,6 +309,8 @@
               kill-phase-on: FAILURE
               abort-all-job: false
               property-file: $WORKSPACE/change.properties
+              enable-condition:
+                !include-raw: '../scripts/k8s-job-enable-condition.gvy'
 
     publishers:
       - postbuildscript:

diff --git a/jjb/cloud-infra/scripts/k8s-job-enable-condition.gvy b/jjb/cloud-infra/scripts/k8s-job-enable-condition.gvy
new file mode 100644 (file)
index 0000000..e865965
--- /dev/null
+++ b/jjb/cloud-infra/scripts/k8s-job-enable-condition.gvy
@@ -0,0 +1 @@
+!('{environment-type}' == 'offline' && "${{DEPLOY_SCENARIO}}" in ['k8-eno-ovs', 'k8-calico-istio', 'k8-calico-eiffel', 'k8-calico-spinnaker'])
\ No newline at end of file