Browse Source

Use cirros image from cached for demo provisioning

Currently, we are using cached image for UEC (tempest) but not for demo
provisioning.

Change-Id: I637edcdcc129dc8ed86eb4f3fdd4e216dd3f48a7
(cherry picked from commit f9cc0729ae)

Use https for cirros downloads

http is being much slower and anyway using https is a good practice.

Change-Id: Ib9b4194c88cd9065babb81c788ed52b2ee5b8d2f
(cherry picked from commit 97e5a40dbb)
changes/67/690867/3
Alfredo Moralejo yatinkarel <ykarel@redhat.com> 7 months ago
parent
commit
21e85e1a8c
5 changed files with 9 additions and 6 deletions
  1. +4
    -4
      packstack/plugins/provision_700.py
  2. +2
    -2
      run_tests.sh
  3. +1
    -0
      tests/scenario001.sh
  4. +1
    -0
      tests/scenario002.sh
  5. +1
    -0
      tests/scenario003.sh

+ 4
- 4
packstack/plugins/provision_700.py View File

@@ -32,22 +32,22 @@ PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue')

DEMO_IMAGE_NAME = 'cirros'
DEMO_IMAGE_URL = (
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img'
'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img'
% (arch.cirros_arch())
)
DEMO_IMAGE_SSH_USER = 'cirros'
DEMO_IMAGE_FORMAT = 'qcow2'
UEC_IMAGE_NAME = 'cirros-uec'
UEC_IMAGE_KERNEL_URL = (
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-kernel'
'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-kernel'
% (arch.cirros_arch())
)
UEC_IMAGE_RAMDISK_URL = (
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-initramfs'
'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-initramfs'
% (arch.cirros_arch())
)
UEC_IMAGE_DISK_URL = (
'http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img'
'https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-%s-disk.img'
% (arch.cirros_arch())
)



+ 2
- 2
run_tests.sh View File

@@ -197,14 +197,14 @@ if [ -f ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz ]; then
tar -xzvf ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -C /tmp/cirros/
else
echo "No pre-cached uec archive found, downloading..."
wget --tries=10 http://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -P /tmp/cirros/
wget --tries=10 https://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -P /tmp/cirros/
tar -xzvf /tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-uec.tar.gz -C /tmp/cirros/
fi
if [ -f ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img ]; then
cp -p ~/cache/files/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img /tmp/cirros/
else
echo "No pre-cached disk image found, downloading..."
wget --tries=10 http://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img -P /tmp/cirros/
wget --tries=10 https://download.cirros-cloud.net/$CIRROS_VERSION/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img -P /tmp/cirros/
fi
echo "Using pre-cached images:"
find /tmp/cirros -type f -printf "%m %n %u %g %s %t" -exec md5sum \{\} \;


+ 1
- 0
tests/scenario001.sh View File

@@ -43,6 +43,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
--provision-image-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
--provision-demo=y \
--provision-tempest=y \
--run-tempest=y \


+ 1
- 0
tests/scenario002.sh View File

@@ -44,6 +44,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
--provision-image-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
--provision-demo=y \
--provision-tempest=y \
--run-tempest=y \


+ 1
- 0
tests/scenario003.sh View File

@@ -43,6 +43,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--provision-uec-kernel-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
--provision-image-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
--provision-demo=y \
--provision-tempest=y \
--run-tempest=y \


Loading…
Cancel
Save