Add basic system arch support to test scenarios

Currently, test scenarios 001-003 will only look for x86 cirros
images. This patch adds support by grabbing the system arch and
creating a string to match the downloaded cirros image in
run_tests.sh.

Currently, ppc64le and x86 will use different cirros versions,
as x86 experiences kernel panics with 0.4.0, which power needs.

Change-Id: Ibc9c2f4d9d8d34e416b3b57cfde0a51d0917e689
This commit is contained in:
Adam Kimball 2018-04-12 18:59:21 +00:00
parent e0dca01ebd
commit 2aef0edad8
4 changed files with 23 additions and 21 deletions

View File

@ -179,30 +179,32 @@ which pip || $SUDO easy_install pip
rm -rf /tmp/cirros
mkdir /tmp/cirros
# Select cirros arch and image version based on system architecture, and export them for use by the test scenarios.
# As of April 2018, Packstack on x86 has kernel panics with the 0.4.0 cirros image. However, ppc64le requires it.
# As such, for now, we set x86 boxes to use version 0.3.5, and ppc64le boxes to use 0.4.0.
export CIRROS_ARCH="$(uname -p)"
arch="$(uname -p)"
case $arch in
case $CIRROS_ARCH in
x86_64)
cirros_version="0.3.5"
export CIRROS_VERSION="0.3.5"
;;
ppc64le)
cirros_version="0.4.0"
export CIRROS_VERSION="0.4.0"
;;
esac
if [ -f ~/cache/files/cirros-$cirros_version-$arch-uec.tar.gz ]; then
tar -xzvf ~/cache/files/cirros-$cirros_version-$arch-uec.tar.gz -C /tmp/cirros/
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-$arch-uec.tar.gz -P /tmp/cirros/
tar -xzvf /tmp/cirros/cirros-$cirros_version-$arch-uec.tar.gz -C /tmp/cirros/
wget --tries=10 http://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-$arch-disk.img ]; then
cp -p ~/cache/files/cirros-$cirros_version-$arch-disk.img /tmp/cirros/
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-$arch-disk.img -P /tmp/cirros/
wget --tries=10 http://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 \{\} \;

View File

@ -39,9 +39,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--os-neutron-l2-agent=ovn \
--os-neutron-ml2-type-drivers="geneve,flat" \
--os-neutron-ml2-tenant-network-types="geneve" \
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
--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-demo=y \
--provision-tempest=y \
--run-tempest=y \

View File

@ -40,9 +40,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--os-neutron-vpnaas-install=n \
--os-sahara-install=y \
--os-trove-install=y \
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
--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-demo=y \
--provision-tempest=y \
--run-tempest=y \

View File

@ -39,9 +39,9 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--os-heat-install=y \
--os-magnum-install=y \
--os-panko-install=y \
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.5-x86_64-vmlinuz" \
--provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.5-x86_64-initrd" \
--provision-uec-disk-url="/tmp/cirros/cirros-0.3.5-x86_64-disk.img" \
--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-demo=y \
--provision-tempest=y \
--run-tempest=y \