diff options
| -rw-r--r-- | .zuul.yaml | 5 | ||||
| -rw-r--r-- | devstack/lib/heat | 8 | ||||
| -rw-r--r-- | doc/source/getting_started/on_devstack.rst | 4 | ||||
| -rwxr-xr-x | heat_integrationtests/cleanup_test_env.sh | 2 | ||||
| -rwxr-xr-x | heat_integrationtests/prepare_test_env.sh | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 4dc60e3d3..8126325e6 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-31-1.9.x86_64 + image_ref: Fedora-Cloud-Base-32-1.6.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 @@ -136,6 +136,9 @@ - job: name: grenade-heat-multinode parent: grenade-multinode + # FIXME(ramishra): Make it voting once stable/victoria + # starts using available images from mirror. + voting: false required-projects: - opendev.org/openstack/heat - opendev.org/openstack/heat-tempest-plugin diff --git a/devstack/lib/heat b/devstack/lib/heat index 7bc7d92f3..d3dcd6197 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -447,7 +447,9 @@ function create_heat_accounts { function configure_tempest_for_heat { # Skip SoftwareConfigIntegrationTest because it requires a custom image # Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled - iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, SoftwareConfigIntegrationTest, AodhAlarmTest' + # Skip CfnInitIntegrationTest as latest fedora images don't have heat-cfntools + iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, \ + SoftwareConfigIntegrationTest, AodhAlarmTest, CfnInitIntegrationTest' # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list 'LoadBalancerv2Test, NotificationTest' @@ -476,9 +478,9 @@ function configure_tempest_for_heat { if [[ -e /etc/ci/mirror_info.sh ]]; then source /etc/ci/mirror_info.sh fi - export HEAT_TEST_FEDORA_IMAGE=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/fedora/linux}/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2 + export HEAT_TEST_FEDORA_IMAGE=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/fedora/linux}/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.qcow2 TOKEN=$(openstack token issue -c id -f value) - local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-31-1.9.x86_64" ) + local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-32-1.6.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 32f67b8e3..81716c4d5 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/31/CloudImages/x86_64/images/" - IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2" + IMAGE_URL_PATH="/pub/fedora/linux/releases/32/Cloud/x86_64/images/" + IMAGE_URL_FILE="Fedora-Cloud-Base-32-1.6.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 9862fd45f..30196a230 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-31-1.9.x86_64 +openstack image delete Fedora-Cloud-Base-32-1.6.x86_64 diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh index cb38a152f..31d682a71 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-31-1.9.x86_64 + iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-32-1.6.x86_64 iniset $conf_file heat_plugin minimal_image_ref $default_image_name iniset $conf_file heat_plugin hidden_stack_tag hidden |