From: Ross Brattain <ross.b.brattain@intel.com>
Date: Fri, 20 Apr 2018 16:57:35 +0000 (-0700)
Subject: disable NSB (DPDK) image load for ARM
X-Git-Tag: opnfv-7.0.0~352
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=15cec319ab06f161c239ead78da9ecdf1673b7ce;p=yardstick.git

disable NSB (DPDK) image load for ARM

we skip the building now but we also need to skip the image loading

JIRA: YARDSTICK-1124

Change-Id: I27c40d6319e74374282203132cfc2c7ebff9b094
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
---

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index a2bd39ce2..818adcaf6 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -124,7 +124,9 @@ load_yardstick_image()
             ${EXTRA_PARAMS} \
             --file ${QCOW_IMAGE} \
             yardstick-image)
-        if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then
+        # DPDK compile is not enabled for arm64 yet so disable NSB images for now
+        # JIRA: YARSTICK-1124
+        if [[ $DEPLOY_SCENARIO == *[_-]ovs_dpdk[_-]* && "${YARD_IMG_ARCH}" != "arm64" ]]; then
             nsb_output=$(eval openstack ${SECURE} image create \
                 --public \
                 --disk-format qcow2 \