aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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