diff options
| author | rabi <ramishra@redhat.com> | 2017-10-31 15:55:06 +0530 |
|---|---|---|
| committer | rabi <ramishra@redhat.com> | 2017-11-03 13:14:47 +0530 |
| commit | c3c2713c40c6f5b45143e73f57a8034514576500 (patch) | |
| tree | f24f7bf70aea8652f3075f950d76ba92f92e47f6 | |
| parent | e671d93b1508650d1da3587f96a2f8561825e24c (diff) | |
| download | heat-c3c2713c40c6f5b45143e73f57a8034514576500.tar.gz | |
Fix ocata gate issues
This includes two changes:
1. set CEILOMETER_BACKEND=mysql for pike/ocata
2. Switch integration jobs to use local mirrors
The Fedora 24 image mirror used does not exist anymore.
Let's use Fedora 26 and the nodepool morrors.
Change-Id: I42490c82a37a179414b5d34f547df4d145ee8aa7
Closes-Bug: #1728883
(cherry picked from commit 7d0ce4a1be11a28d60cd40342afe6a6aa2b66d1c
and a47e342f4d0cad4ff314a3f546b6661c8ec67777)
| -rwxr-xr-x | heat_integrationtests/cleanup_test_env.sh | 2 | ||||
| -rwxr-xr-x | heat_integrationtests/pre_test_hook.sh | 11 | ||||
| -rwxr-xr-x | heat_integrationtests/prepare_test_env.sh | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh index a6a4d6629..a62e00339 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-heat-test-image
\ No newline at end of file +openstack image delete Fedora-Cloud-Base-26-1.5.x86_64 diff --git a/heat_integrationtests/pre_test_hook.sh b/heat_integrationtests/pre_test_hook.sh index 6677b3da9..41bd99323 100755 --- a/heat_integrationtests/pre_test_hook.sh +++ b/heat_integrationtests/pre_test_hook.sh @@ -40,6 +40,17 @@ echo -e '[eventlet_opts]\nclient_socket_timeout=120\n' >> $localconf echo "[[local|localrc]]" >> $localconf + +# NOTE(mnaser): This will use the region local mirrors to avoid going out +# to network +if [[ -e /etc/ci/mirror_info.sh ]]; then + source /etc/ci/mirror_info.sh + echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/26/CloudImages/x86_64/images/Fedora-Cloud-Base-26-1.5.x86_64.qcow2" >> $localconf +else + echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/26/CloudImages/x86_64/images/Fedora-Cloud-Base-26-1.5.x86_64.qcow2" >> $localconf +fi + +echo "CEILOMETER_BACKEND=mysql" >> $localconf echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localconf # Use the lbaas v2 namespace driver for devstack integration testing since diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh index 4dae9a026..09937f1ce 100755 --- a/heat_integrationtests/prepare_test_env.sh +++ b/heat_integrationtests/prepare_test_env.sh @@ -50,15 +50,7 @@ iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro openstack flavor create m1.heat_int --ram 512 openstack flavor create m1.heat_micro --ram 128 -# Register the glance image for testing -curl http://mirror.liquidtelecom.com/fedora/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2 | openstack image create fedora-heat-test-image --disk-format qcow2 --container-format bare --public -if [[ ${PIPESTATUS[0]} -ne 0 ]]; then - # The curl command failed, so the upload is mostly likely incorrect. Let's - # bail out early. - exit 1 -fi - -iniset $conf_file heat_plugin image_ref fedora-heat-test-image +iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-26-1.5.x86_64 iniset $conf_file heat_plugin boot_config_env $DEST/heat-templates/hot/software-config/boot-config/test_image_env.yaml iniset $conf_file heat_plugin heat_config_notify_script $DEST/heat-templates/hot/software-config/elements/heat-config/bin/heat-config-notify iniset $conf_file heat_plugin minimal_image_ref cirros-0.3.4-x86_64-uec |