summaryrefslogtreecommitdiffstats
path: root/ci/build.sh
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-30 23:03:43 -0400
committerDan Radez <dradez@redhat.com>2017-05-09 15:09:42 -0400
commitac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 (patch)
treeed0c27aa4853848b0e47e3ce3de25dfb23bfc8df /ci/build.sh
parentef3dc1ce0323fa0881e416cd4b9028fb4250b719 (diff)
Updating Apex to OpenStack Ocata
- power management updated to virtualbmc, pxe_ssh is deprecated - removing custom tacker build - removing custom congress build - disabling yum update in undercloud on the cli instead of in a patch - Undercloud is direct kernel booted now, there are no kernel and initrd in the disk image from upstream - remove OpenDaylight previous to Carbon JIRA: APEX-433 JIRA: APEX-432 JIRA: APEX-431 Change-Id: I6963f16e65eacade5607a3082b58b6150331406c Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci/build.sh')
-rwxr-xr-xci/build.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/ci/build.sh b/ci/build.sh
index 3531a657..31d7ba62 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -35,7 +35,7 @@ CACHE_DEST=""
CACHE_DIR="${APEX_ROOT}/.cache"
CACHE_NAME="apex-cache"
MAKE_TARGETS="images"
-REQUIRED_PKGS="rpm-build python-docutils"
+REQUIRED_PKGS="rpm-build python-docutils python2-virtualbmc"
RELEASE_RPM=""
parse_cmdline() {
@@ -129,7 +129,10 @@ if [[ -n "$CACHE_DEST" && -n "$MAKE_TARGETS" ]]; then
rm -rf $CACHE_DIR
mkdir $CACHE_DIR
echo "Unpacking Cache to ${CACHE_DIR}"
- tar -xvzf ${CACHE_DEST}/${CACHE_NAME}.tgz -C ${CACHE_DIR}
+ tar -xvzf ${CACHE_DEST}/${CACHE_NAME}.tgz -C ${CACHE_DIR} || {
+ rm ${CACHE_DEST}/${CACHE_NAME}.tgz
+ echo "Cache unpack failed, Will rebuild."
+ }
echo "Cache contents after unpack:"
ls -al ${CACHE_DIR}
else