From 3e102a940811ccd9d08eb8362f739394334eda91 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 17 Aug 2016 21:56:22 +0200 Subject: build: Use OPNFV_GIT_SHA for ISO preparer ID isoinfo -i lists the following information for Fuel@OPNFV ISO: "Data preparer id: 86aafaf5454a846c417848bb94f264c4420160f3" where the SHA hash is Fuel git repo HEAD SHA. For Armband's build system, using only the Fuel commit ID is not enough to fully describe the state of the source code, as patches are also applied to other fuel modules (as git submodules). Instead, a pointer to a valid Armband commit ID should be used. However, Armband overrides OPNFV_GIT_SHA to the Armband git repo commit hash, so the ISO metadata should also reflect this. While at it, allow product name to be overriden, to signal the commit ID should be looked up inside the Armband repository. Change-Id: I33ad490f1afe28c1d439dda40e39cee1955e0ac2 Signed-off-by: Alexandru Avadanii (cherry picked from commit 94ea115c36d5f5c79823692ac80626cf8959b35d) --- build/docker/runcontext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/docker/runcontext') 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" -- cgit 1.2.3-korg