diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 16 | ||||
| -rwxr-xr-x | ci/test.sh | 19 |
2 files changed, 27 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index ab51a1f5..05e2fa2b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1001,6 +1001,22 @@ if ! heat stack-list | grep CREATE_COMPLETE 1>/dev/null; then fi EOI + # Configure DPDK + if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI || (echo "DPDK config failed, exiting..."; exit 1) +source stackrc +set -o errexit +for node in \$(nova list | grep novacompute | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+"); do +echo "Running DPDK test app on \$node" +ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF +set -o errexit +sudo dpdk_helloworld --no-pci +sudo dpdk_nic_bind -s +EOF +done +EOI + fi + if [ "$debug" == 'TRUE' ]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source overcloudrc @@ -10,19 +10,22 @@ set -e -# Make sure python is installed -if ! rpm -q python34-devel > /dev/null; then - sudo yum install -y epel-release - if ! sudo yum install -y python34-devel; then - echo "Failed to install python34-devel package..." - exit 1 +# Make sure python dependencies are installed +for pkg in epel-release python34-devel python34-nose; do + if ! rpm -q ${pkg} > /dev/null; then + if ! sudo yum install -y ${pkg}; then + echo "Failed to install ${pkg} package..." + exit 1 fi -fi + fi +done # Make sure coverage is installed if ! python3 -c "import coverage" &> /dev/null; then sudo easy_install-3.4 coverage; fi +pushd ../build/ > /dev/null make python-tests +popd > /dev/null pushd ../tests/ > /dev/null percent=$(coverage3 report --include '*lib/python/*' -m | grep TOTAL | tr -s ' ' | awk '{ print $4 }' | cut -d % -f 1) if [[ percent -lt 80 ]]; then @@ -30,4 +33,4 @@ if [[ percent -lt 80 ]]; then echo "Does not meet 80% requirement" exit 1 fi -popd > /dev/nul +popd > /dev/null |