Merge "Add postprocess script"

diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh
index 3c4c7f9..a1ae67d 100755 (executable)
--- a/jjb/functest/functest-cleanup.sh
+++ b/jjb/functest/functest-cleanup.sh
@@ -10,7 +10,7 @@ if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
 fi
 
 # Remove existing images if exist
-if [[ $CLEAN_DOCKER_IMAGES ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then
+if [[ $CLEAN_DOCKER_IMAGES == true ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then
     echo "Docker images to remove:"
     docker images | head -1 && docker images | grep opnfv/functest >${redirect}
     image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 5aecf58..4a50a59 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -113,7 +113,7 @@
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'none'
+            default: 'os-odl_l2-bgpvpn-noha'
             description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK