From 5b8cbd58950302bf5ed8f60dd5374150f7b34af9 Mon Sep 17 00:00:00 2001
From: Kien Nguyen <kiennt@vn.fujitsu.com>
Date: Fri, 9 Feb 2018 13:37:27 +0700
Subject: [PATCH] Run the specified set of tests in grenade-multinode job

This patch defines the specified set of tests & runs these during
upgrade in grenade-multinode job.

Change-Id: I99fa1717f4bf46afc8dd989a3aae129e5c4ab9d7
---
 devstack/upgrade/resources.sh                 | 41 ++++++++++++++++---
 heat_integrationtests/prepare_test_env.sh     |  4 +-
 heat_integrationtests/prepare_test_network.sh |  5 ++-
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index ff864d1f1f..6057324e7a 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -36,11 +36,27 @@ function _heat_set_user {
     OS_PROJECT_DOMAIN_ID=$DEFAULT_DOMAIN
 }
 
-function _run_heat_api_tests {
+function _write_heat_integrationtests {
+    local upgrade_tests=$1
+    cat > $upgrade_tests <<EOF
+heat_tempest_plugin.tests.api
+heat_integrationtests.functional.test_autoscaling
+heat_integrationtests.functional.test_cancel_update
+heat_integrationtests.functional.test_create_update
+heat_integrationtests.functional.test_instance_group
+heat_integrationtests.functional.test_resource_group.ResourceGroupTest
+heat_integrationtests.functional.test_resource_group.ResourceGroupUpdatePolicyTest
+heat_integrationtests.functional.test_software_deployment_group
+heat_integrationtests.functional.test_validation
+heat_tempest_plugin.tests.functional.test_software_config.ParallelDeploymentsTest
+heat_tempest_plugin.tests.functional.test_nova_server_networks
+EOF
+}
+
+function _run_heat_integrationtests {
     local devstack_dir=$1
 
     pushd $devstack_dir/../tempest
-    sed -i -e '/group_regex/c\group_regex=heat_tempest_plugin\\.tests\\.api\\.test_heat_api(?:\\.|_)([^_]+)' .stestr.conf
     conf_file=etc/tempest.conf
     iniset_multiline $conf_file service_available heat_plugin True
     iniset $conf_file heat_plugin username $OS_USERNAME
@@ -53,14 +69,27 @@ function _run_heat_api_tests {
     iniset $conf_file heat_plugin project_domain_name $OS_PROJECT_DOMAIN_NAME
     iniset $conf_file heat_plugin region $OS_REGION_NAME
     iniset $conf_file heat_plugin auth_version $OS_IDENTITY_API_VERSION
-    tox -evenv-tempest -- tempest run --regex heat_tempest_plugin.tests.api
+
+    export DEST=$(dirname $devstack_dir)
+    $DEST/heat/heat_integrationtests/prepare_test_env.sh
+    $DEST/heat/heat_integrationtests/prepare_test_network.sh
+
+    # Run set of specified functional tests
+    UPGRADE_TESTS=upgrade_tests.list
+    _write_heat_integrationtests $UPGRADE_TESTS
+
+    tox -evenv-tempest -- stestr --test-path=$DEST/heat/heat_integrationtests --top-dir=$DEST/heat \
+        --group_regex='heat_tempest_plugin\.tests\.api\.test_heat_api[._]([^_]+)' \
+        run --whitelist-file $UPGRADE_TESTS
+    _heat_set_user
     popd
 }
 
 function create {
-    # run heat api tests instead of tempest smoke before create
-    _run_heat_api_tests $BASE_DEVSTACK_DIR
+    # run heat integration tests instead of tempest smoke before create
+    _run_heat_integrationtests $BASE_DEVSTACK_DIR
 
+    source $TOP_DIR/openrc admin admin
     # creates a tenant for the server
     eval $(openstack project create -f shell -c id $HEAT_PROJECT)
     if [[ -z "$id" ]]; then
@@ -94,7 +123,7 @@ function verify {
     _heat_set_user
     local side="$1"
     if [[ "$side" = "post-upgrade" ]]; then
-        _run_heat_api_tests $TARGET_DEVSTACK_DIR
+        _run_heat_integrationtests $TARGET_DEVSTACK_DIR
     fi
     stack_name=$(resource_get heat stack_name)
     heat stack-show $stack_name
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 8976fe6d51..00e56eb2ff 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -87,5 +87,5 @@ function _config_tempest_plugin
 _config_functionaltests
 _config_tempest_plugin
 
-openstack flavor create m1.heat_int --ram 512
-openstack flavor create m1.heat_micro --ram 128
+openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512
+openstack flavor show m1.heat_micro || openstack flavor create m1.heat_micro --ram 128
diff --git a/heat_integrationtests/prepare_test_network.sh b/heat_integrationtests/prepare_test_network.sh
index a69af4ea6b..01125a89c7 100755
--- a/heat_integrationtests/prepare_test_network.sh
+++ b/heat_integrationtests/prepare_test_network.sh
@@ -20,6 +20,7 @@ HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24
 
 # create a heat specific private network (default 'private' network has ipv6 subnet)
 source $DEST/devstack/openrc demo demo
-openstack network create heat-net
-openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR
+
+openstack network show heat-net || openstack network create heat-net
+openstack subnet show heat-subnet || openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR
 openstack router add subnet router1 heat-subnet