x
/
snap-glance
Code Issues Proposed changes

Use cirros images. 

Switched to using cirros images rather than ubuntu cloud images, as
they are smaller, and thus better for testing. They should also go
through the zuul reverse proxy.

Update env variables to work with the tweaks to snapstack.

Change-Id: I989f1d2eacefebd2a72f75897e09b2c8b9e856ef
This commit is contained in:
Pete Vander Giessen 2017-08-07 13:14:51 +00:00
parent 84668a42dc
commit 480d749443
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/glance.sh
View File

@ -31,11 +31,14 @@ sudo systemctl restart snap.glance.*
while ! nc -z localhost 9292; do sleep 0.1; done;
openstack image show xenial || {
[ -f $HOME/images/xenial-server-cloudimg-amd64-disk1.img ] || {
[ -f $HOME/images/cirros-0.3.5-x86_64-disk.img ] || {
export http_proxy=$SNAPSTACK_HTTP_PROXY
mkdir -p $HOME/images
wget http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img \
-O ${HOME}/images/xenial-server-cloudimg-amd64-disk1.img
wget \
http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img \
-O ${HOME}/images/cirros-0.3.5-x86_64-disk.img
unset http_proxy
}
openstack image create --file ${HOME}/images/xenial-server-cloudimg-amd64-disk1.img \
--public --container-format=bare --disk-format=qcow2 xenial
openstack image create --file ${HOME}/images/cirros-0.3.5-x86_64-disk.img \
--public --container-format=bare --disk-format=qcow2 cirros
}

4
tox.ini
View File

@ -8,7 +8,9 @@ install_command = pip install {opts} {packages}
passenv =
HOME
TERM
SNAP_BUILD_PROXY
SNAPSTACK_HTTP_PROXY
SNAPSTACK_HTTPS_PROXY
whitelist_externals =
sudo
snapcraft