Merge "jjb: xci: Only set default scenario if no scenario is set"

diff --combined jjb/xci/xci-set-scenario.sh
index b591dd2,9cb9407..8ef5254
--- 1/jjb/xci/xci-set-scenario.sh
--- 2/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@@ -7,6 -7,7 +7,6 @@@
  # which accompanies this distribution, and is available at
  # http://www.apache.org/licenses/LICENSE-2.0
  ##############################################################################
 -set -o errexit
  set -o pipefail
  
  #----------------------------------------------------------------------
@@@ -96,22 -97,26 +96,26 @@@ function determine_generic_scenario() 
      # get the changeset
      cd $WORKSPACE
      SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq)
-     # We need to set default scenario for changes that do not mess with scenarios
-     NO_SCENARIOS=$(git diff HEAD^..HEAD --name-only | grep -v 'xci/scenarios' | cut -d "/" -f 3 | uniq)
+     # We need to set default scenario for changes that mess with installers
+     INSTALLERS=$(git diff HEAD^..HEAD --name-only -- 'xci/installer' | cut -d "/" -f 3 | uniq)
      for CHANGED_SCENARIO in $SCENARIOS; do
-         [[ ${DEPLOY_SCENARIO[@]} =~ $CHANGED_SCENARIO ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO
+         DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO
      done
-     for CHANGED_FILE in $NO_SCENARIOS; do
-         case $CHANGED_FILE in
+     for CHANGED_INSTALLER in $INSTALLERS; do
+         case $CHANGED_INSTALLER in
              kubespray)
-                 [[ ${DEPLOY_SCENARIO[@]} =~ "k8-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
+                 DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature'
                  ;;
              # Default case (including OSA changes)
              *)
-                 [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+                 DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
                  ;;
          esac
      done
+     # For all other changes, we only need to set a default scenario if it's not set already
+     if git diff HEAD^..HEAD --name-only | grep -q -v 'xci/installer\|xci/scenario'; then
+          [[ ${#DEPLOY_SCENARIO[@]} -gt 0 ]] && DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature'
+     fi
  
      # extract releng-xci sha
      XCI_SHA=$(cd $WORKSPACE && git rev-parse HEAD)