openstack
/
heat
Code Issues Proposed changes

Switch integration jobs to use local mirrors 

The integration jobs currently download images from a third party
mirror which can be slow at times or use up a lot of bandwidth.

This patch tries to automatically detect if nodepool mirrors are
active and uses them, falling back to the global round-robin mirror
of the Fedora project instead of a specific mirror.

Change-Id: Ie111c20b6dd0efe2e1cbfcac2a46b27ce6bc20c0
This commit is contained in:
Mohammed Naser 2017-08-10 13:51:13 -04:00
parent fa6ccf2d1f
commit a47e342f4d
No known key found for this signature in database
GPG Key ID: 481CBC90384AEC42
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat_integrationtests/cleanup_test_env.sh
View File

@ -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-24-1.2.x86_64
openstack image delete Fedora-Cloud-Base-26-1.5.x86_64

11
heat_integrationtests/pre_test_hook.sh
View File

@ -44,8 +44,15 @@ echo -e '[[post-config|$NOVA_CONF]]\n[DEFAULT]\n' >> $localconf
echo -e 'quota_driver=nova.quota.NoopQuotaDriver\n' >> $localconf
echo "[[local|localrc]]" >> $localconf
# Create the images required for testing
echo "IMAGE_URLS+=http://fedora.bhs.mirrors.ovh.net/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.qcow2" >> $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_PIPELINE_INTERVAL=60" >> $localconf
echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localconf

2
heat_integrationtests/prepare_test_env.sh
View File

@ -51,7 +51,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
iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-24-1.2.x86_64
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.5-x86_64-disk