CACHE_DEST=""
CACHE_DIR="cache"
CACHE_NAME="apex-cache"
-PYTHON_TESTS="TRUE"
MAKE_TARGETS="images"
REQUIRED_PKGS="rpm-build python-docutils"
+RELEASE_RPM=""
parse_cmdline() {
while [ "${1:0:1}" = "-" ]
echo "Buiding opnfv-apex RPMs"
shift 1
;;
- --skip-python-tests )
- PYTHON_TESTS="FALSE"
- echo "Skipping Python Tests"
+ --release-rpm )
+ RELEASE_RPM=" release-rpm"
+ echo "Buiding opnfv-apex RPMs"
shift 1
;;
--debug )
parse_cmdline "$@"
+# Add release rpm to make targets if defined
+MAKE_TARGETS+=$RELEASE_RPM
+
# Install build dependencies
for pkg in $REQUIRED_PKGS; do
if ! rpm -q $pkg > /dev/null; then
# Conditionally execute RPM build checks if the specs change and target is not rpm or iso
if [[ "$MAKE_TARGETS" == "images" ]]; then
- commit_file_list=$(git show --pretty="format:" --name-only)
- if [[ $commit_file_list == *build/Makefile* ]]; then
+ commit_file_list=$(git show --pretty="format:" --name-status)
+ if git show -s | grep "force-build-rpms"; then
+ MAKE_TARGETS+=" rpms"
+ elif [[ $commit_file_list == *"A$(printf '\t')"* || $commit_file_list == *build/Makefile* ]]; then
# Makefile forces all rpms to be checked
MAKE_TARGETS+=" rpms-check"
else
# Spec files are selective
- if [[ $commit_file_list == *build/opnfv-apex-undercloud.spec* ]]; then
+ if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-undercloud.spec* ]]; then
MAKE_TARGETS+=" undercloud-rpm-check"
fi
- if [[ $commit_file_list == *build/opnfv-apex-common.spec* ]]; then
+ if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-release.spec* ]]; then
+ MAKE_TARGETS+=" release-rpm-check"
+ fi
+ if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-common.spec* ]]; then
MAKE_TARGETS+=" common-rpm-check"
fi
- if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+ if [[ $commit_file_list == *build/rpm_specs/opnfv-apex.spec* ]]; then
MAKE_TARGETS+=" opendaylight-rpm-check"
fi
- if [[ $commit_file_list == *build/opnfv-apex-onos.spec* ]]; then
+ if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-onos.spec* ]]; then
MAKE_TARGETS+=" onos-rpm-check"
fi
- if [[ $commit_file_list == *build/opnfv-apex-opendaylight-sfc.spec* ]]; then
- MAKE_TARGETS+=" opendaylight-sfc-rpm-check"
- fi
fi
fi
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