diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-04-24 10:34:03 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-05-04 12:03:37 -0400 |
| commit | bd101b2edba9928cafddabb4612186ac825b7343 (patch) | |
| tree | b4260ab049034b9d254d395eaf305c13f54cfd20 /foreman/ci | |
| parent | 4266577cd0a7c0816cd3bf951522c7ad1633f02b (diff) | |
adding rpmbuild to the Makefile for the foreman build
This will allow content in the genesis repo to be provided to
the centos install via rpm
Change-Id: Ib84759211c56006007913010fb3f73f84271b57d
JIRA: BGS-41
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'foreman/ci')
| -rwxr-xr-x | foreman/ci/build.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/foreman/ci/build.sh b/foreman/ci/build.sh index f3d5cf0..0f71636 100755 --- 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" +CACHE_TMP="${SCRIPT_DIR}/tmp" TEST_SUCCEED=0 TEST_FAIL=0 UNIT_TEST=0 @@ -290,11 +291,11 @@ echo $$ > ${LOCK_FILE} 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 - ${REMOTE_ACCESS_METHD} -o /tmp/cache/${LOCAL_CACHE_ARCH_NAME}.tgz ${BUILD_CACHE_URI}/${REMOTE_CACHE_ARCH_NAME}.tgz + ${REMOTE_ACCESS_METHD} -o ${CACHE_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 rc=$? set -e @@ -303,8 +304,8 @@ if [ ! -z ${BUILD_CACHE_URI} ]; then 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=$? @@ -314,9 +315,9 @@ if [ ! -z ${BUILD_CACHE_URI} ]; then 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 - rm -rf /tmp/cache + rm -rf ${CACHE_TMP}/cache fi fi fi |