diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-27 04:41:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-27 04:41:32 +0000 |
| commit | 8f842fbb2225753c0564d30e7c166902540676bd (patch) | |
| tree | e3d7ca949c2de88b7ff6ceb820524628c4983b40 | |
| parent | 5799adcbd18a90c23bdb20ebe4ca9ef1a193f35b (diff) | |
| parent | 05753f486d5e08248107ae3bcbd8f1e25100f488 (diff) | |
| download | heat-8f842fbb2225753c0564d30e7c166902540676bd.tar.gz | |
Merge "Update Fedora image ref for test jobs" into stable/rocky
| -rwxr-xr-x | heat_integrationtests/cleanup_test_env.sh | 2 | ||||
| -rwxr-xr-x | heat_integrationtests/pre_test_hook.sh | 4 | ||||
| -rwxr-xr-x | heat_integrationtests/prepare_test_env.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh index f30189e62..26d49c1db 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 9c713dbd6..ecd6b26ab 100755 --- a/heat_integrationtests/prepare_test_env.sh +++ b/heat_integrationtests/prepare_test_env.sh @@ -48,7 +48,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 cirros-0.3.5-x86_64-disk iniset $conf_file heat_plugin hidden_stack_tag hidden |