xci: Fix scenario determination logic 19/68419/4
authorFatih Degirmenci <fdegir@gmail.com>
Sat, 31 Aug 2019 15:20:43 +0000 (17:20 +0200)
committerFatih Degirmenci <fdegir@gmail.com>
Sat, 31 Aug 2019 15:45:56 +0000 (17:45 +0200)
commit417d91d8d6de7b0887759b5a17a0bafa5aed7cbe
treecbfd2a3d8010c4c94663ef4532ce3f0fd2b3a9c5
parent3ecb0c33570d1b37a2034db84c499fcc3a95012b
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>
jjb/xci/xci-set-scenario.sh