From e455219d358ea70decd04a7f5fd4148d2ae6f811 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Tue, 5 Apr 2016 14:22:05 -0400
Subject: Makefile & build.sh updates for RPM Building
- fix the undercloud dependancy chain so the tarball gets rolled now
- adding rpm-check jobs for each of the rpms, this runs the build but doesn't spit out the rpm file
- added conditionals for rpm-check commands, only take the time to run them if the Makefile or specs have changed
Change-Id: I9731b278d06d92deb3f69066ba4468e64647582d
Signed-off-by: Dan Radez <dradez@redhat.com>
---
ci/build.sh | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
(limited to 'ci')
diff --git a/ci/build.sh b/ci/build.sh
index b5bfc8ca..2fd8c26d 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -34,7 +34,7 @@ BUILD_BASE=$(readlink -e ../build/)
CACHE_DEST=""
CACHE_DIR="cache"
CACHE_NAME="apex-cache"
-MAKE_TARGET="images"
+MAKE_TARGETS="images"
parse_cmdline() {
while [ "${1:0:1}" = "-" ]
@@ -53,12 +53,12 @@ parse_cmdline() {
shift 2
;;
--iso )
- MAKE_TARGET="iso"
+ MAKE_TARGETS="iso"
echo "Building opnfv-apex RPMs and ISO"
shift 1
;;
--rpms )
- MAKE_TARGET="rpms"
+ MAKE_TARGETS="rpms"
echo "Buiding opnfv-apex RPMs"
shift 1
;;
@@ -76,6 +76,10 @@ parse_cmdline() {
}
+run_make() {
+ make $MAKE_ARGS -C ${BUILD_BASE} $1
+}
+
parse_cmdline "$@"
if [ -n "$RELEASE" ]; then MAKE_ARGS+="RELEASE=$RELEASE "; fi
@@ -98,8 +102,37 @@ if [[ ! -d ../build_output ]]; then
ln -s build/noarch/ ../build_output
fi
-# Execute Make
-make $MAKE_ARGS -C ${BUILD_BASE} $MAKE_TARGET
+# 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
+ # 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
+ MAKE_TARGETS+=" undercloud-rpm-check"
+ fi
+ if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+ MAKE_TARGETS+=" common-rpm-check"
+ fi
+ if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+ MAKE_TARGETS+=" opendaylight-rpm-check"
+ fi
+ if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+ MAKE_TARGETS+=" onos-rpm-check"
+ fi
+ if [[ $commit_file_list == *build/opnfv-apex.spec* ]]; then
+ MAKE_TARGETS+=" opendaylight-sfc-rpm-check"
+ fi
+ fi
+fi
+
+# Execute make against targets
+for t in $MAKE_TARGETS; do
+ run_make $t
+done
+
echo "Build Complete"
# Build new Cache
--
cgit