Add scenario testing for multinode-oooq jobs

This commit adds scenario testing for multinode-oooq jobs. Initially
this commit enables scenario001, however does it in a portable way that
will allow other scenarios to be added without code change.

This commit also cleans up some small inconsistencies or incorrectnesses
in the oooq-multinode runner script, such as config order passed to
quickstart.sh.

Change-Id: Iae8c6c3a7360469ce18b8a5fbadf6150d4939470
Depends-On: I51df15a5534f4b9cb9e3d4a6c18ed3a5ae0d91d7

scripts/quickstart/multinode-settings.yml

@@ -7,10 +7,13 @@ gating_repo_enabled: true
 tripleo_root: "{{ lookup('env','TRIPLEO_ROOT') }}"
 extra_args: >
     -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml
-    -e /usr/share/openstack-tripleo-heat-templates/ci/environments/multinode.yaml
     -e ${TRIPLEO_ROOT}/tripleo-ci/test-environments/worker-config.yaml
     -e /usr/share/openstack-tripleo-heat-templates/environments/debug.yaml
     --compute-scale 0
+
+deploy_composable_scenario: true
+composable_scenario: "multinode.yaml"
+
 ssl_overcloud: false
 network_isolation: false
 flavor_args: ""

toci_instack_oooq_multinode.sh

@@ -22,7 +22,9 @@ sudo chown $USER:$USER $HOME/.ssh/id_rsa.pub
 
 # TODO(sshnaidm): To create tripleo-ci special yaml config files in oooq
 # for every TOCI_JOBTYPE, i.e. ovb-nonha-ipv6.yml
-if [[ "$TOCI_JOBTYPE" =~ "-ha" ]]; then
+if [[ "$TOCI_JOBTYPE" =~ "scenario" ]]; then
+    CONFIG=${CONFIG:-"$TRIPLEO_ROOT/tripleo-quickstart-extras/config/general_config/${TOCI_JOBTYPE/-oooq*/}.yml"}
+elif [[ "$TOCI_JOBTYPE" =~ "-ha" ]]; then
     CONFIG=${CONFIG:-"$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/ha.yml"}
 elif [[ "$TOCI_JOBTYPE" =~ "-nonha" ]]; then
     CONFIG=${CONFIG:-"$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/minimal.yml"}
@@ -69,8 +71,8 @@ export OOOQ_ARGS=" --working-dir ${OPT_WORKDIR} \
                    --tags build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-post-install,overcloud-scripts,overcloud-deploy \
                    --teardown none \
                    --release ${STABLE_RELEASE:-master} \
-                   --config config/general_config/minimal.yml \
                    --extra-vars @${TRIPLEO_ROOT}/tripleo-ci/scripts/quickstart/multinode-settings.yml \
+                   --config ${CONFIG} \
                    --playbook multinode-playbook.yml \
                    --requirements requirements.txt \
                    --requirements quickstart-extras-requirements.txt \
@@ -140,10 +142,10 @@ sed -i 's/hosts: all:!localhost/hosts: all:!localhost:!127.0.0.2/' $OPT_WORKDIR/
 
 $TRIPLEO_ROOT/tripleo-quickstart/quickstart.sh --bootstrap --no-clone \
         $OOOQ_DEFAULT_ARGS \
-        --config $CONFIG \
         --playbook collect-logs.yml \
         -e artcl_collect_dir=$OOOQ_LOGS \
         -e @$TRIPLEO_ROOT/tripleo-ci/scripts/quickstart/multinode-settings.yml \
+        --config $CONFIG \
         -e tripleo_root=$TRIPLEO_ROOT \
         127.0.0.2 &> $OOOQ_LOGS/quickstart_collectlogs.log ||
         echo "WARNING: quickstart collect-logs failed, check quickstart_collectlogs.log for details"