Merge "build: ISO refactor, use docker, enable cache"

1 files changed, 7 insertions, 41 deletions

diff --git a/ci/build.sh b/ci/build.sh
index fbaa7261..3e372f0f 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -5,47 +5,13 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
-error_exit() {
-    echo "$@" >&2
-    exit 1
-}
-
-write_gitinfo() {
-    git_url=$(git config --get remote.origin.url)
-    git_rev=$(git rev-parse HEAD)
-    echo "$git_url: $git_rev"
-}
-
-if [ $# -eq 0 ]; then
-    OUTPUT_DIR=$(pwd)
-else
-    OUTPUT_DIR=$(readlink -f $1)
-    shift
-fi
-
-mkdir -p $OUTPUT_DIR || error_exit "Could not create directory $OUTPUT_DIR"
-
-echo "Building armband, output dir: $OUTPUT_DIR"
-cd ..
-
 SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
-BUILD_BASE="${SCRIPT_DIR}/upstream/fuel/build"
-RESULT_DIR="${BUILD_BASE}/release"
-
-make REVSTATE="${OPNFV_ARTIFACT_VERSION}" release ||
-    error_exit "Make release failed"
-
-write_gitinfo >> ${BUILD_BASE}/gitinfo_armband.txt
+BUILD_BASE=$(readlink -e ${SCRIPT_DIR}/../upstream/fuel/build)
 
-echo "Moving results to $OUTPUT_DIR"
-sort ${BUILD_BASE}/gitinfo*.txt > ${OUTPUT_DIR}/gitinfo.txt
-mv ${RESULT_DIR}/*.iso ${OUTPUT_DIR}/
-mv ${RESULT_DIR}/*.iso.txt ${OUTPUT_DIR}/
+export ARMBAND_BASE=$(readlink -e ${SCRIPT_DIR}/..)
+export OPNFV_GIT_SHA=$(git rev-parse HEAD)
+export LOCAL_CACHE_ARCH_NAME="armband-cache"
 
-# We need to build our own ODL plugin, and when this happens, fuel
-# renames the iso to unofficial-opnfv-${REVSTATE}.iso, so here we remove
-# the prefix:
-pushd ${OUTPUT_DIR} > /dev/null
-rename 's/^unofficial-//' *.iso
-rename 's/^unofficial-//' *.iso.txt
-popd > /dev/null
+# Initialize Armband git submodules & apply patches first
+make -C ${ARMBAND_BASE} submodules-clean patches-import
+cd ${ARMBAND_BASE}/upstream/fuel/ci && ./build.sh $*