Merge "Update Functest jjobs (patrole)"

diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index 79b31bf..bc78101 100755 (executable)
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -92,6 +92,13 @@ if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then
     echo "Skipping verify!"
     echo "DEPLOY_SCENARIO=os-nosdn-nofeature" > $WORK_DIRECTORY/scenario.properties
     exit 0
+elif [[ "$GERRIT_TOPIC" =~ 'force-verify' ]]; then
+    # Run the deployment with default installer and scenario when multiple things change
+    # and we want to force that.
+    echo "Forcing CI verification of default scenario and installer!"
+    echo "INSTALLER_TYPE=osa" > $WORK_DIRECTORY/scenario.properties
+    echo "DEPLOY_SCENARIO=os-nosdn-nofeature" >> $WORK_DIRECTORY/scenario.properties
+    exit 0
 fi
 
 if [[ $GERRIT_PROJECT == "releng-xci" ]]; then