commit cb2ff87cd7c87d893cea1f296bb22d0c14ee64ac
Author: Rabi Mishra <ramishra@redhat.com>
Date:   Fri Oct 9 14:42:48 2020 +0530

    Use Fedora 31 for tests
    
    Aso configures swap as before
    
    https://review.opendev.org/750941 changed the default
    swap to 1024MB for jobs and this seems to resulting in
    high failure rate of the functional and grenade jobs.
    
    Let's configure it back to what used to before i.e 8192MB.
    
    Change-Id: Ia45e957bb24f5596a5ef16271f71ba8b77df9e42
    (cherry picked from commit f18a6767927965b930579995eb0b3d13c647bc26
    and cherry picked from commit f419923a0d3aa62485296ab7666485e74af57c8e)

diff --git a/.zuul.yaml b/.zuul.yaml
index 200746c..bae4c4d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,6 +29,7 @@
       - ^heat/tests/.*$
       - ^releasenotes/.*$
     vars:
+      configure_swap_size: 8192
       disable_convergence: 'false'
       sql: mysql
       use_amqp1: 0
@@ -88,6 +89,7 @@
       - ^releasenotes/.*$
       - ^setup.cfg$
     vars:
+      configure_swap_size: 8192
       topology: aio
       branch_override: default
 
diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst
index 6fb850c..30840d7 100644
--- a/doc/source/getting_started/on_devstack.rst
+++ b/doc/source/getting_started/on_devstack.rst
@@ -51,8 +51,8 @@ a VM image that heat can launch. To do that add the following to
 `[[local|localrc]]` section of `local.conf`::
 
     IMAGE_URL_SITE="https://download.fedoraproject.org"
-    IMAGE_URL_PATH="/pub/fedora/linux/releases/25/CloudImages/x86_64/images/"
-    IMAGE_URL_FILE="Fedora-Cloud-Base-25-1.3.x86_64.qcow2"
+    IMAGE_URL_PATH="/pub/fedora/linux/releases/31/CloudImages/x86_64/images/"
+    IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2"
     IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
 
 URLs for any cloud image may be specified, but fedora images from F20 contain
diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh
index b8e576e..9ae413e 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-30-1.2.x86_64
+openstack image delete Fedora-Cloud-Base-31-1.9.x86_64
diff --git a/heat_integrationtests/pre_test_hook.sh b/heat_integrationtests/pre_test_hook.sh
index 9b8126d..5e814c4 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/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
+	echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2" >> $localconf
 else
-	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
+	echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.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 05d7cba..cb38a15 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-30-1.2.x86_64
+    iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-31-1.9.x86_64
     iniset $conf_file heat_plugin minimal_image_ref $default_image_name
     iniset $conf_file heat_plugin hidden_stack_tag hidden