Merge "Update Fedora image ref and add UPPER_CONSTRAINTS_FILE" into stable/stein

4 files changed, 19 insertions, 9 deletions

diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 1b7be42ee..d1587fc54 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -53,6 +53,12 @@ heat_tempest_plugin.tests.functional.test_nova_server_networks
 EOF
 }
 
+function _run_heat_integrationt {
+        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
+}
+
 function _run_heat_integrationtests {
     local devstack_dir=$1
 
@@ -65,9 +71,11 @@ function _run_heat_integrationtests {
     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
+    if [[ $2 == 'post-upgrade' ]]; then
+        _run_heat_integrationt
+    else
+        UPPER_CONSTRAINTS_FILE=${UPPER_CONSTRAINTS_FILE:-$DEST/requirements/upper-constraints.txt} _run_heat_integrationt
+    fi
     _heat_set_user
     popd
 }
@@ -75,7 +83,9 @@ function _run_heat_integrationtests {
 function create {
     if [ "${RUN_HEAT_INTEGRATION_TESTS}" == "True" ]; then
         # run heat integration tests instead of tempest smoke before create
-        _run_heat_integrationtests $BASE_DEVSTACK_DIR
+        # create function in grenade alway run in pre-upgrade.
+        # TODO(ricolin) but we need to update grenade to pass down $side to here.
+        _run_heat_integrationtests $BASE_DEVSTACK_DIR pre-upgrade
     fi
 
     source $TOP_DIR/openrc admin admin
@@ -113,7 +123,7 @@ function verify {
     local side="$1"
     if [[ "$side" = "post-upgrade" ]]; then
         if [ "${RUN_HEAT_INTEGRATION_TESTS}" == "True" ]; then
-            _run_heat_integrationtests $TARGET_DEVSTACK_DIR
+            _run_heat_integrationtests $TARGET_DEVSTACK_DIR $side
         fi
     fi
     stack_name=$(resource_get heat stack_name)
diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh
index ee32d17a3..b8e576e68 100755
--- a/heat_integrationtests/cleanup_test_env.sh
+++ b/heat_integrationtests/cleanup_test_env.sh
@@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int
 openstack flavor delete m1.heat_micro
 
 # delete the image created
-openstack image delete Fedora-Cloud-Base-29-1.2.x86_64
+openstack image delete Fedora-Cloud-Base-30-1.2.x86_64
diff --git a/heat_integrationtests/pre_test_hook.sh b/heat_integrationtests/pre_test_hook.sh
index 8194e97cd..9b8126dea 100755
--- a/heat_integrationtests/pre_test_hook.sh
+++ b/heat_integrationtests/pre_test_hook.sh
@@ -44,9 +44,9 @@ echo "[[local|localrc]]" >> $localconf
 #               to network
 if [[ -e /etc/ci/mirror_info.sh ]]; then
 	source /etc/ci/mirror_info.sh
-	echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/29/Cloud/x86_64/images/Fedora-Cloud-Base-29-1.2.x86_64.qcow2" >> $localconf
+	echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
 else
-	echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/29/Cloud/x86_64/images/Fedora-Cloud-Base-29-1.2.x86_64.qcow2" >> $localconf
+	echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
 fi
 
 echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 636972205..21715dd16 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -46,7 +46,7 @@ function _config_iniset {
     iniset $conf_file heat_plugin instance_type m1.heat_int
     iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro
 
-    iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-29-1.2.x86_64
+    iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-30-1.2.x86_64
     iniset $conf_file heat_plugin minimal_image_ref $default_image_name
     iniset $conf_file heat_plugin hidden_stack_tag hidden