Merge "jjb: xci: Drop the VM cleanup step from the functest jobs"

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index 7a5ef74..92eea19 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -261,8 +261,6 @@
     builders:
       - shell:
           !include-raw: ./xci-run-functest.sh
-      - shell:
-          !include-raw: ./xci-cleanup.sh
 
 - builder:
     name: 'xci-merge-promote-macro'

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 82ca5ab..b1fe23d 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -284,5 +284,3 @@
     builders:
       - shell:
           !include-raw: ./xci-run-functest.sh
-      - shell:
-          !include-raw: ./xci-cleanup.sh