Use f36 instead of f33 for testing

F33 is unsupported for a while. We should not use it for any testing.

Change-Id: I7d1017bcd7147329c4e187336daee1a1ae280fa9
(cherry picked from commit 78244c5f0f26064cd53b68e13fa8c4f0e235e698)
(cherry picked from commit eefb921612b6d560e9f28767ba3a40e25bdd4f7d)
(cherry picked from commit b32163d9e35e522577b99110ebd1614de55f5653)

5 files changed, 9 insertions, 8 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 29d8e969d..986ee1693 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -75,7 +75,7 @@
               minimal_image_ref: ${DEFAULT_IMAGE_NAME:-cirros-0.3.6-x86_64-disk}
               instance_type: m1.heat_int
               minimal_instance_type: m1.heat_micro
-              image_ref: Fedora-Cloud-Base-33-1.2.x86_64
+              image_ref: Fedora-Cloud-Base-36-1.5.x86_64
               hidden_stack_tag: hidden
               heat_config_notify_script: /opt/stack/heat-agents/heat-config/bin/heat-config-notify
               boot_config_env: /opt/stack/heat-templates/hot/software-config/boot-config/test_image_env.yaml
@@ -140,6 +140,7 @@
       - opendev.org/openstack/heat
       - opendev.org/openstack/heat-tempest-plugin
       - opendev.org/openstack/python-heatclient
+    voting: false
     vars:
       grenade_devstack_localrc:
         shared:
diff --git a/devstack/lib/heat b/devstack/lib/heat
index 5f5f17252..e981d23ff 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -449,7 +449,7 @@ function configure_tempest_for_heat {
     # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
     iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list 'LoadBalancerv2Test, NotificationTest'
 
-    openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512 --disk 4
+    openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512 --disk 10
     openstack flavor show m1.heat_micro || openstack flavor create m1.heat_micro --ram 128 --disk 1
 
     source $TOP_DIR/openrc demo demo
@@ -478,14 +478,14 @@ function configure_tempest_for_heat {
         source /etc/ci/mirror_info.sh
     fi
     HEAT_TEST_FEDORA_IMAGE_UPSTREAM=https://download.fedoraproject.org/pub/fedora/linux
-    HEAT_TEST_FEDORA_IMAGE_PATH=releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-33-1.2.x86_64.qcow2
+    HEAT_TEST_FEDORA_IMAGE_PATH=releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2
     if curl --output /dev/null --silent --head --fail "${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then
         export HEAT_TEST_FEDORA_IMAGE="${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
     else
         export HEAT_TEST_FEDORA_IMAGE="${HEAT_TEST_FEDORA_IMAGE_UPSTREAM}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
     fi
     TOKEN=$(openstack token issue -c id -f value)
-    local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-33-1.2.x86_64" )
+    local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-36-1.5.x86_64" )
     if [[ -z $image_exists ]]; then
         if is_service_enabled g-api; then
             upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN
diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst
index 29581390d..64d607ab2 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/33/Cloud/x86_64/images/"
-    IMAGE_URL_FILE="Fedora-Cloud-Base-33-1.2.x86_64.qcow2"
+    IMAGE_URL_PATH="/pub/fedora/linux/releases/36/Cloud/x86_64/images/"
+    IMAGE_URL_FILE="Fedora-Cloud-Base-36-1.5.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 12791c9fd..8cc5fb1ce 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-33-1.2.x86_64
+openstack image delete Fedora-Cloud-Base-36-1.5.x86_64
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 45b86e493..d4e440f73 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-33-1.2.x86_64
+    iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-36-1.5.x86_64
     iniset $conf_file heat_plugin minimal_image_ref $default_image_name
     iniset $conf_file heat_plugin hidden_stack_tag hidden