Upstream: IPMI port + Mitaka mirror.

[armband.git] / ci / build.sh

diff --git a/ci/build.sh b/ci/build.sh
index 256f828..fbaa726 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -10,6 +10,12 @@ error_exit() {
     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
@@ -23,12 +29,23 @@ echo "Building armband, output dir: $OUTPUT_DIR"
 cd ..
 
 SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
-BUILD_BASE=$(readlink -e ${SCRIPT_DIR}/upstream/fuel/build/)
+BUILD_BASE="${SCRIPT_DIR}/upstream/fuel/build"
 RESULT_DIR="${BUILD_BASE}/release"
 
-make release || error_exit "Make release failed"
+make REVSTATE="${OPNFV_ARTIFACT_VERSION}" release ||
+    error_exit "Make release failed"
 
-echo "Copying results to $OUTPUT_DIR"
+write_gitinfo >> ${BUILD_BASE}/gitinfo_armband.txt
+
+echo "Moving results to $OUTPUT_DIR"
 sort ${BUILD_BASE}/gitinfo*.txt > ${OUTPUT_DIR}/gitinfo.txt
-cp ${RESULT_DIR}/*.iso ${OUTPUT_DIR}/
-cp ${RESULT_DIR}/*.iso.txt ${OUTPUT_DIR}/
+mv ${RESULT_DIR}/*.iso ${OUTPUT_DIR}/
+mv ${RESULT_DIR}/*.iso.txt ${OUTPUT_DIR}/
+
+# 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