From: Ross Brattain Date: Thu, 19 Apr 2018 05:00:53 +0000 (-0700) Subject: Update git submodules X-Git-Tag: opnfv-6.0.0~137 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=16e4b2f674edcefcc4251205019932421dff835e;p=opnfvdocs.git Update git submodules * Update docs/submodules/yardstick from branch 'stable/fraser' - disable DPDK images for ARM We are trying to compile DPDK for the os-nosdn-ovs-ha scenario because we added TC042  "Measure network latency using testpmd and pktgen-dpdk". However it looks like TC042 is only enabled for compass in opnfv_os-nosdn-kvm_ovs_dpdk-ha https://gerrit.opnfv.org/gerrit/#/c/54659/1/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml - file_name: opnfv_yardstick_tc042.yaml constraint: installer: compass pod: huawei-pod1 We don't actually need TC042 and DPDK or os-nosdn-ovs-ha. But in order to run TC042 we have to know beforehand that we are going to use DPDK, so we have a conditional in the load_images.sh script that tries to guess when we will need a DPDK image. The conditional only checks for *[_-]ovs[_-]* if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then ansible-playbook \ -e img_property="nsb" \ -e YARD_IMG_ARCH=${YARD_IMG_ARCH} \ -vvv -i inventory.ini build_yardstick_image.yml if [ ! -f "${QCOW_NSB_IMAGE}" ]; then echo "Failed building QCOW NSB image" exit 1 fi fi For this release we won't be able to get DPDK images to compile on ARM, we should fix this conditional and not try to compile. Also change the shell glob to match *[_-]ovs_dpdk[_-]* to only enable DPDK images for ovs_dpdk scenarios JIRA: YARDSTICK-1124 Change-Id: I03142e6b8aa00dc9cdf9b446868fb723cd10198b Signed-off-by: Ross Brattain (cherry picked from commit 50154694f8dc37726d456cfb8efddc6d3e126dbd) --- diff --git a/docs/submodules/yardstick b/docs/submodules/yardstick index 33094877f..cd33c58be 160000 --- a/docs/submodules/yardstick +++ b/docs/submodules/yardstick @@ -1 +1 @@ -Subproject commit 33094877f2c8344776fbe90a25ba643056b85a2b +Subproject commit cd33c58be8252a9a462b0e89482059f1277b12e9