summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlexandru Nemes <alexandru.nemes@enea.com>2017-05-16 15:50:27 +0300
committerAlexandru Nemes <alexandru.nemes@enea.com>2017-07-03 11:39:35 +0000
commit241b693baaec90347d08e63eb1dc167a0033ec21 (patch)
treea0c0599bd0e8cdebd9df2d8ee958bb73c4c4fbc3 /tests
parent0367765435e89f1590c6db25b74880b8014164c8 (diff)
Yardstick: Aarch64 jenkins slave support
Change-Id: I2d58c38d75fc1fe036769340e9fb02932f543510 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/ci/clean_images.sh2
-rwxr-xr-xtests/ci/load_images.sh14
2 files changed, 12 insertions, 4 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index f25006487..5cb0700df 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -25,7 +25,7 @@ cleanup()
return
fi
- for image in $(openstack ${SECURE} image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-16.04 \
+ for image in $(openstack ${SECURE} image list | grep -e cirros-0.3.5 -e cirros-d161201 -e yardstick-image -e Ubuntu-16.04 \
| awk '{print $2}'); do
echo "Deleting image $image..."
openstack ${SECURE} image delete $image || true
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 0c197b313..8e0a2f68a 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -150,13 +150,21 @@ load_yardstick_image()
load_cirros_image()
{
- if [[ -n $(openstack ${SECURE} image list | grep -e Cirros-0.3.5) ]]; then
- echo "Cirros-0.3.5 image already exist, skip loading cirros image"
+ if [[ "${YARD_IMG_ARCH}" == "arm64" ]]; then
+ CIRROS_IMAGE_VERSION="cirros-d161201"
+ CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-d161201-aarch64-disk.img"
+ else
+ CIRROS_IMAGE_VERSION="Cirros-0.3.5"
+ CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-0.3.5-x86_64-disk.img"
+ fi
+
+ if [[ -n $(openstack ${SECURE} image list | grep -e "${CIRROS_IMAGE_VERSION}") ]]; then
+ echo "${CIRROS_IMAGE_VERSION} image already exist, skip loading cirros image"
else
echo
echo "========== Loading cirros cloud image =========="
- local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img
+ local image_file="${CIRROS_IMAGE_PATH}"
EXTRA_PARAMS=""
# VPP requires guest memory to be backed by large pages