summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log1
-rwxr-xr-xci/build.sh20
-rwxr-xr-xci/deploy.sh11
-rwxr-xr-xci/test.sh33
4 files changed, 39 insertions, 26 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index da13a48f..0b479c65 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -6,3 +6,4 @@
18,Fix sql race condition
21,Serialize db_sync calls and increase sql-sleep timer
23,Fix odl env files
+25,Force metadata on all scenarios
diff --git a/ci/build.sh b/ci/build.sh
index 1bd96d53..dd9f9fd1 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -34,7 +34,6 @@ BUILD_BASE=$(readlink -e ../build/)
CACHE_DEST=""
CACHE_DIR="cache"
CACHE_NAME="apex-cache"
-PYTHON_TESTS="TRUE"
MAKE_TARGETS="images"
REQUIRED_PKGS="rpm-build python-docutils"
@@ -64,11 +63,6 @@ parse_cmdline() {
echo "Buiding opnfv-apex RPMs"
shift 1
;;
- --skip-python-tests )
- PYTHON_TESTS="FALSE"
- echo "Skipping Python Tests"
- shift 1
- ;;
--debug )
debug="TRUE"
echo "Enable debug output"
@@ -151,20 +145,6 @@ if ! rpm -q python34-devel > /dev/null; then
fi
fi
-if [ "$PYTHON_TESTS" == "TRUE" ]; then
- # Make sure coverage is installed
- if ! python3 -c "import coverage" &> /dev/null; then sudo easy_install-3.4 coverage; fi
-
- run_make python-tests
- 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
- echo "Python Coverage: $percent"
- echo "WARNING: Does not meet 80% requirement"
- fi
- popd
-fi
-
# Execute make against targets
for t in $MAKE_TARGETS; do
run_make $t
diff --git a/ci/deploy.sh b/ci/deploy.sh
index a2634c16..50a11fb7 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -804,11 +804,7 @@ function undercloud_prep_overcloud_deploy {
exit 1
fi
- # Handle different dataplanes
- if [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
- echo "${red}ovs is the only currently available dataplane. ${deploy_options_array['dataplane']} not implemented${reset}"
- exit 1
- fi
+
# Make sure the correct overcloud image is available
if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then
@@ -842,9 +838,12 @@ EOF
--upload uio_pci_generic.modules:/etc/sysconfig/modules/ \
--run-command "chmod 0755 /etc/sysconfig/modules/vfio_pci.modules" \
--run-command "chmod 0755 /etc/sysconfig/modules/uio_pci_generic.modules" \
+ --run-command "yum install -y /root/dpdk_rpms/*" \
-a overcloud-full.qcow2
EOI
-
+ elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
+ echo "${red}${deploy_options_array['dataplane']} not supported${reset}"
+ exit 1
fi
# Set ODL version accordingly
diff --git a/ci/test.sh b/ci/test.sh
new file mode 100755
index 00000000..0f2bc046
--- /dev/null
+++ b/ci/test.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+##############################################################################
+# Copyright (c) 2016 Dan Radez (Red Hat)
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+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
+ fi
+fi
+
+# Make sure coverage is installed
+if ! python3 -c "import coverage" &> /dev/null; then sudo easy_install-3.4 coverage; fi
+
+make python-tests
+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
+ echo "Python Coverage: $percent"
+ echo "Does not meet 80% requirement"
+ exit 1
+fi
+popd > /dev/nul