Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX for Ubuntu repository settings in dea.yaml
[genesis.git]
/
foreman
/
ci
/
build.sh
diff --git
a/foreman/ci/build.sh
b/foreman/ci/build.sh
index
f3d5cf0
..
7a1ef52
100755
(executable)
--- a/
foreman/ci/build.sh
+++ b/
foreman/ci/build.sh
@@
-100,6
+100,7
@@
INCLUDE_DIR=../include
#
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
LOCK_FILE="${SCRIPT_DIR}/.build.lck"
#
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
LOCK_FILE="${SCRIPT_DIR}/.build.lck"
+CACHE_TMP="${SCRIPT_DIR}/tmp"
TEST_SUCCEED=0
TEST_FAIL=0
UNIT_TEST=0
TEST_SUCCEED=0
TEST_FAIL=0
UNIT_TEST=0
@@
-290,12
+291,11
@@
echo $$ > ${LOCK_FILE}
if [ ! -z ${BUILD_CACHE_URI} ]; then
if [ ${POPULATE_CACHE} -ne 1 ]; then
if [ ! -z ${BUILD_CACHE_URI} ]; then
if [ ${POPULATE_CACHE} -ne 1 ]; then
- rm -rf
/tmp
/cache
- mkdir
/tmp
/cache
+ rm -rf
${CACHE_TMP}
/cache
+ mkdir
-p ${CACHE_TMP}
/cache
echo "Downloading cach file ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME} ..."
set +e
echo "Downloading cach file ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME} ..."
set +e
- ${REMOTE_ACCESS_METHD} -o /tmp/cache/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz
- tar -tzf ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz >/dev/null
+ ${REMOTE_ACCESS_METHD} -o ${CACHE_TMP}/cache/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz
rc=$?
set -e
if [ $rc -ne 0 ]; then
rc=$?
set -e
if [ $rc -ne 0 ]; then
@@
-303,8
+303,8
@@
if [ ! -z ${BUILD_CACHE_URI} ]; then
POPULATE_CACHE=1
else
echo "Unpacking cache file ..."
POPULATE_CACHE=1
else
echo "Unpacking cache file ..."
- tar -C
/tmp/cache -xvf /tmp
/cache/${LOCAL_CACHE_ARCH_NAME}.tgz
- cp
/tmp
/cache/cache/.versions ${BUILD_BASE}/.
+ tar -C
${CACHE_TMP}/cache -xvf ${CACHE_TMP}
/cache/${LOCAL_CACHE_ARCH_NAME}.tgz
+ cp
${CACHE_TMP}
/cache/cache/.versions ${BUILD_BASE}/.
set +e
make -C ${BUILD_BASE} validate-cache;
rc=$?
set +e
make -C ${BUILD_BASE} validate-cache;
rc=$?
@@
-314,9
+314,9
@@
if [ ! -z ${BUILD_CACHE_URI} ]; then
echo "Cache invalid - a new cache will be built "
POPULATE_CACHE=1
else
echo "Cache invalid - a new cache will be built "
POPULATE_CACHE=1
else
- cp -rf
/tmp
/cache/cache/. ${BUILD_BASE}
+ cp -rf
${CACHE_TMP}
/cache/cache/. ${BUILD_BASE}
fi
fi
- rm -rf
/tmp
/cache
+ rm -rf
${CACHE_TMP}
/cache
fi
fi
fi
fi
fi
fi