if [ -n "$CACHE_DEST" ]; then
echo "Retrieving Cache"
if [ -f $CACHE_DEST/${CACHE_NAME}.tgz ]; then
+ echo "Cache found at ${CACHE_DEST}/${CACHE_NAME}.tgz"
rm -rf $BUILD_BASE/$CACHE_DIR
- cp -f $CACHE_DEST/${CACHE_NAME}.tgz $BUILD_BASE/${CACHE_NAME}.tgz
- tar xzf $BUILD_BASE/${CACHE_NAME}.tgz
+ echo "Unpacking Cache to $BUILD_BASE"
+ tar -xvzf $CACHE_DEST/${CACHE_NAME}.tgz -C ${BUILD_BASE}
+ echo "Cache contents after unpack:"
+ ls -l $BUILD_BASE/$CACHE_DIR
elif [ ! -d $BUILD_BASE/$CACHE_DIR ]; then
mkdir $BUILD_BASE/$CACHE_DIR
fi
fi
-#create build_output for legacy functionality compatibility in jenkins
-if [[ ! -d ../build_output ]]; then
- rm -f ../build_output
- ln -s build/noarch/ ../build_output
-fi
-
# 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.spec* ]]; then
+ 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.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.spec* ]]; then
- MAKE_TARGETS+=" opendaylight-sfc-rpm-check"
- fi
fi
fi
# Build new Cache
if [ -n "$CACHE_DEST" ]; then
echo "Building Cache"
- tar --atime-preserve --dereference -C $BUILD_BASE -caf $BUILD_BASE/${CACHE_NAME}.tgz $CACHE_DIR
- echo "Copying Cache"
if [ ! -d $CACHE_DEST ]; then mkdir -p $CACHE_DEST; fi
- cp $BUILD_BASE/${CACHE_NAME}.tgz $CACHE_DEST/${CACHE_NAME}.tgz
+ tar --atime-preserve --dereference -C $BUILD_BASE -caf $BUILD_BASE/${CACHE_NAME}.tgz $CACHE_DIR -C ${CACHE_DEST}/
+ if [ -f "${CACHE_DEST}/${CACHE_NAME}.tgz" ]; then
+ echo "Cache Build Complete"
+ else
+ echo "WARN: Cache file did not build correctly"
+ fi
fi
echo "Complete"