Merge "Revert "Cleanup after zipping to save space on constrained nodes e.g. Berlin""
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 63649e9..8ab138c 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -19,15 +19,14 @@
           time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-test-bbsim-2.4'
+          name: 'periodic-voltha-test-bbsim-2.5'
           pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
           build-node: 'qct-pod4-node2'
           make-target: functional-single-kind
-          code-branch: 'voltha-2.4'
+          code-branch: 'voltha-2.5'
           onus: 2
           pons: 2
           time-trigger: "H H/12 * * *"
-          karaf-home: 'apache-karaf-4.2.8'
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-etcd-test'
@@ -40,10 +39,10 @@
           time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-etcd-test-2.4'
+          name: 'periodic-voltha-etcd-test-2.5'
           pipeline-script: 'voltha-system-test-bbsim.groovy'
           build-node: 'ubuntu16.04-basebuild-4c-8g'
-          code-branch: 'voltha-2.4'
+          code-branch: 'voltha-2.5'
           make-target: sanity-multi-kind
           onus: 2
           pons: 2
@@ -62,16 +61,15 @@
           time-trigger: "H H/12 * * *"
 
       - 'voltha-periodic-test':
-          name: 'periodic-voltha-sanity-test-multi-runs-2.4'
+          name: 'periodic-voltha-sanity-test-multi-runs-2.5'
           pipeline-script: 'voltha-go-multi-tests.groovy'
           build-node: 'qct-pod4-node2'
-          code-branch: 'voltha-2.4'
+          code-branch: 'voltha-2.5'
           make-target: sanity-kind
           onus: 1
           pons: 1
           test-runs: 5
           time-trigger: "H H/12 * * *"
-          karaf-home: 'apache-karaf-4.2.8'
 
       - 'voltha-periodic-test':
           name: 'nightly-voltha-DTflow-sanity-test'