aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJosep Puigdemont <josep.puigdemont@enea.com>2016-04-22 11:07:40 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-02 14:38:10 +0000
commit25ac022f9ff13907a78855e29ff6488fb2979b11 (patch)
treeca8614a117e817fc54dbf0a57b3231328609bc22 /ci
parent91254b30e2fdf5a6f4ddc8d065645da3f3cb87df (diff)
Pass revision version to the build fuel system
Fuel makes use of the REVSTATE variable in the make file to alter the name of the resulting ISO image. We need to honor the revision specified by the jenkins build system at OPNFV, and pass this variable along to fuel@opnfv. Change-Id: I1f80dfcae313058dd9a4486bbbfdfbb0b52ea405 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> (cherry picked from commit 9a07b1737dd78f1f1bb8baeb3604379211ee84cf)
Diffstat (limited to 'ci')
-rwxr-xr-xci/build.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/ci/build.sh b/ci/build.sh
index 99de559a..38be2547 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -32,11 +32,20 @@ SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
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"
-write_gitinfo >> ${BUILD_BASE}/gitinfo.txt
+write_gitinfo >> ${BUILD_BASE}/gitinfo_armband.txt
echo "Copying 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}/
+
+# 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