xci: Fix scenario determination logic

Function override_xci_flavor exits with 0 early, preventing
the rest of the script and especially override_scenario function
to run. This makes it impossible to verify patches that contains
installer-type or deploy-scenario in commit message since the
generated scenario.properties file contains only XCI_FLAVOR in
it, causing verify jobs to fail determining the installer type
and the scenario. See the example.

https://build.opnfv.org/ci/job/xci-verify-ubuntu-virtual-master/2937/console

This change removes exit 0 from override_xci_flavor and moves
the call to it to after override_scenario function.

JIRA: XCI-21

Change-Id: Ic7f943ba5e1562177b59a8215cd8a6f2a58db093
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index 2c35f27..237eb31 100755 (executable)
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -53,11 +53,12 @@ function override_scenario() {
     if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment|force-verify ]]; then
         [[ "$GERRIT_TOPIC" =~ force-verify ]] && echo "Forcing CI verification using default scenario and installer!"
         [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]] && echo "Skipping verification!"
-        echo "INSTALLER_TYPE=osa" > $WORK_DIRECTORY/scenario.properties
+        echo "INSTALLER_TYPE=osa" >> $WORK_DIRECTORY/scenario.properties
         echo "DEPLOY_SCENARIO=os-nosdn-nofeature" >> $WORK_DIRECTORY/scenario.properties
         echo "XCI_SHA=$XCI_SHA" >> $WORK_DIRECTORY/scenario.properties
         echo "SCENARIO_SHA=$SCENARIO_SHA" >> $WORK_DIRECTORY/scenario.properties
         echo "PROJECT_NAME=$GERRIT_PROJECT" >> $WORK_DIRECTORY/scenario.properties
+        log_scenario_properties
         exit 0
     fi
 
@@ -70,11 +71,12 @@ function override_scenario() {
             echo "Installer type or deploy scenario is not specified. Falling back to programmatically determining them."
         else
             echo "Recording the installer '$INSTALLER_TYPE' and scenario '$DEPLOY_SCENARIO' for downstream jobs"
-            echo "INSTALLER_TYPE=$INSTALLER_TYPE" > $WORK_DIRECTORY/scenario.properties
+            echo "INSTALLER_TYPE=$INSTALLER_TYPE" >> $WORK_DIRECTORY/scenario.properties
             echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO" >> $WORK_DIRECTORY/scenario.properties
             echo "XCI_SHA=$XCI_SHA" >> $WORK_DIRECTORY/scenario.properties
             echo "SCENARIO_SHA=$SCENARIO_SHA" >> $WORK_DIRECTORY/scenario.properties
             echo "PROJECT_NAME=$GERRIT_PROJECT" >> $WORK_DIRECTORY/scenario.properties
+            log_scenario_properties
             exit 0
         fi
     else
@@ -177,21 +179,25 @@ function override_xci_flavor() {
             XCI_FLAVOR='mini'
             echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them."
             echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties
-            exit 0
         else
             echo "Recording the XCI flavor '$XCI_FLAVOR' for downstream jobs"
             echo "XCI_FLAVOR=$XCI_FLAVOR" >> $WORK_DIRECTORY/scenario.properties
-            exit 0
         fi
     else
         XCI_FLAVOR='mini'
         echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them."
         echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties
-        exit 0
     fi
 
 }
 
+function log_scenario_properties() {
+    echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC"
+    echo "-------------------------------------------------------------------------"
+    cat $WORK_DIRECTORY/scenario.properties
+    echo "-------------------------------------------------------------------------"
+}
+
 echo "Determining the impacted scenario"
 
 declare -a DEPLOY_SCENARIO
@@ -208,8 +214,8 @@ if [[ $GERRIT_PROJECT == "releng-xci" ]]; then
     determine_default_scenario
 else
     determine_scenario
-    override_xci_flavor
 fi
+override_xci_flavor
 override_scenario
 
 # ensure single scenario is impacted