summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosep Puigdemont <josep.puigdemont@enea.com>2016-04-22 11:07:40 +0200
committerJosep Puigdemont <josep.puigdemont@enea.com>2016-04-22 11:16:17 +0200
commit9a07b1737dd78f1f1bb8baeb3604379211ee84cf (patch)
tree26bd38a0d64a4ed762a9bf983d476568a0386619
parent8bbaf656043e99b265487dfc9c85ac37ca17abba (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>
-rw-r--r--Makefile5
-rwxr-xr-xci/build.sh13
2 files changed, 16 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0b285a91..f954a611 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,10 @@ clean-build:
release: export LC_ALL=en_US.UTF-8
release: submodules-clean clean-docker clean-build submodules-init patches-import build
+ifneq ($(REVSTATE),)
+ EXTRA_PARAMS="REVSTATE=$(REVSTATE)"
+endif
+
build:
cd ${root}/upstream/fuel/build && \
time make \
@@ -79,5 +83,6 @@ build:
MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
+ $(EXTRA_PARAMS) \
iso 2>&1 | tee ${root}/build.log
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