Removing infrastructure before cleaning VOLTHA

Change-Id: I0ce7d2bdb1fbef386d1c52ce27114e76557e2a35
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 853b7fc..5243d2a 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -68,8 +68,6 @@
       steps {
         timeout(time: 11, unit: 'MINUTES') {
           sh returnStdout: false, script: """
-            test -e $WORKSPACE/kind-voltha/voltha && cd $WORKSPACE/kind-voltha && ./voltha down
-
             for hchart in \$(helm list -q | grep -E -v 'docker-registry|kafkacat|etcd-operator');
             do
                 echo "Purging chart: \${hchart}"
@@ -77,6 +75,8 @@
             done
             bash /home/cord/voltha-scale/wait_for_pods.sh
 
+            test -e $WORKSPACE/kind-voltha/voltha && cd $WORKSPACE/kind-voltha && ./voltha down
+
             cd $WORKSPACE
             rm -rf $WORKSPACE/*
           """