diff options
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rwxr-xr-x | build/docker/runcontext | 2 | ||||
| -rwxr-xr-x | build/install/install.sh | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile index 59d9096c6..661505d9b 100644 --- a/build/Makefile +++ b/build/Makefile @@ -21,11 +21,11 @@ SHELL = /bin/bash export MOSVERSION = 9.0 export ISOSRC = file:$(shell pwd)/fuel-$(MOSVERSION).iso export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC)) -export PRODNO = "OPNFV_FUEL" +export PRODNO ?= "OPNFV_FUEL" export REVSTATE = "P0000" export USER ?= $(shell whoami) export BUILD_DATE = $(shell date --utc +%Y-%m-%d:%H:%M) -export OPNFV_GIT_SHA = $(shell git rev-parse HEAD) +export OPNFV_GIT_SHA ?= $(shell git rev-parse HEAD) # Store in /etc/fuel_build_id on fuel master export BUILD_ID := $(PRODNO)_$(BUILD_DATE)_$(OPNFV_GIT_SHA) diff --git a/build/docker/runcontext b/build/docker/runcontext index daad663ac..2d1356275 100755 --- a/build/docker/runcontext +++ b/build/docker/runcontext @@ -115,7 +115,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \ -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \ -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \ -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \ - -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH \ + -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \ -u $USER_ID:$GROUP_ID -w $PWD \ -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT" diff --git a/build/install/install.sh b/build/install/install.sh index c63241974..866d30419 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -196,8 +196,12 @@ make_iso_image() { find . -name TRANS.TBL -exec rm {} \; rm -rf rr_moved + if [[ -z "$OPNFV_GIT_SHA" ]]; then + OPNFV_GIT_SHA=$(git rev-parse --verify HEAD) + fi + mkisofs --quiet -r -V "$VOLUMEID" -publisher "$PUBLISHER" \ - -p `git rev-parse --verify HEAD` -J -R -b isolinux/isolinux.bin \ + -p "$OPNFV_GIT_SHA" -J -R -b isolinux/isolinux.bin \ -no-emul-boot \ -boot-load-size 4 -boot-info-table \ --hide-rr-moved \ |