Merge "Using the cleanup state to collect the log"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index ab6f339..822d374 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -130,7 +130,7 @@
           released: false
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
-          oltDebVersion: 'openolt_asfvolt16.deb'
+          oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
           configurePod: true
           profile: 'Default'
           time: '1'
@@ -178,7 +178,7 @@
           released: false
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
-          oltDebVersion: 'openolt_asfvolt16.deb'
+          oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
           configurePod: true
           profile: '1T4GEM-bal31'
           time: '4'
@@ -271,6 +271,7 @@
           released: true
           profile: 'Default'
           time: '9'
+          withKind: true
 
       # Berlin POD test job - released versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 65e229c..ebc5174 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -289,7 +289,6 @@
         sh returnStdout: false, script: """
         cd voltha
         git clone -b ${branch} ${cordRepoUrl}/cord-tester
-        git clone -b ${branch} ${cordRepoUrl}/voltha # VOL-2104 recommends we get rid of this
         mkdir -p $WORKSPACE/RobotLogs
         make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
         """