summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-05 03:28:51 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-05 03:28:51 +0000
commitef5aadab9e33e2154789a41bf9dbb8a49b086c21 (patch)
treef8b7549cc0c4c8ec89cb004610fc25e1ffba9364 /ci
parentc3b974355123fe6e5cb2d4cb44215c4de3abd108 (diff)
parent3c11e9669b5559bc9b95192abf97b9613b5854d1 (diff)
Merge "Fixes build caching"
Diffstat (limited to 'ci')
-rwxr-xr-xci/build.sh22
1 files changed, 11 insertions, 11 deletions
diff --git a/ci/build.sh b/ci/build.sh
index e6870558..dec73760 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -99,20 +99,17 @@ if [ -n "$RELEASE" ]; then MAKE_ARGS+="RELEASE=$RELEASE "; fi
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)
@@ -158,9 +155,12 @@ echo "Build Complete"
# 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"