diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rw-r--r-- | build/config.mk | 1 | ||||
| -rwxr-xr-x | build/docker/runcontext | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 7 | ||||
| -rw-r--r-- | build/f_repos/Makefile | 4 | ||||
| -rwxr-xr-x | build/install/install.sh | 6 |
6 files changed, 14 insertions, 10 deletions
diff --git a/build/Makefile b/build/Makefile index 56acb40fe..ac854986c 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/config.mk b/build/config.mk index e5ca615e0..ab278589e 100644 --- a/build/config.mk +++ b/build/config.mk @@ -26,6 +26,7 @@ FUEL_TRACK_REMOTES = # git submodule & patch locations for Fuel components F_GIT_ROOT := $(shell git rev-parse --show-toplevel) +F_GIT_DIR := $(shell git rev-parse --git-dir) F_SUBMOD_DIR := ${F_GIT_ROOT}/build/f_repos/sub F_PATCH_DIR := ${F_GIT_ROOT}/build/f_repos/patch F_OPNFV_TAG := ${FUEL_MAIN_TAG}-opnfv diff --git a/build/docker/runcontext b/build/docker/runcontext index c4f7b29bc..b17571135 100755 --- a/build/docker/runcontext +++ b/build/docker/runcontext @@ -117,7 +117,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/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 7074ee2e0..55facfe4f 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -8,9 +8,8 @@ ############################################################################## FUEL_PLUGIN_ODL_BRANCH ?= master -FUEL_PLUGIN_ODL_CHANGE ?= 58cf41ff4e9ed928bf024b166776b9df1a2e517b +FUEL_PLUGIN_ODL_CHANGE ?= 7281b0db9171e5aeda0c23ba655f086a909395a1 FUEL_PLUGIN_ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git -export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz -export ODL_VERSION_NUMBER?=0.4.3 -export ODL_BORON_TARBALL_LOCATION?=http://artifacts.opnfv.org/fuel/colorado/vendor/distribution-karaf-0.5.0-Boron-RC3.5.tar.gz +export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz +export ODL_VERSION_NUMBER?=0.5.0 diff --git a/build/f_repos/Makefile b/build/f_repos/Makefile index 06d91115d..b5eafff9b 100644 --- a/build/f_repos/Makefile +++ b/build/f_repos/Makefile @@ -150,7 +150,7 @@ get-cache: .cacheid @if $(CACHETOOL) check $(shell cat .cacheid); then \ $(MAKE) clean && \ $(CACHETOOL) get $(shell cat .cacheid) | \ - tar xf - -C ${F_GIT_ROOT}/.git; \ + tar xf - -C ${F_GIT_DIR}; \ else \ echo "No cache item found for $(shell cat .cacheid)" ;\ exit 0;\ @@ -161,6 +161,6 @@ get-cache: .cacheid put-cache: .cacheid @if ! $(CACHETOOL) check $(shell cat .cacheid); then \ $(MAKE) clean && \ - tar cf - -C ${F_GIT_ROOT}/.git modules | \ + tar cf - -C ${F_GIT_DIR} modules | \ $(CACHETOOL) put $(shell cat .cacheid); \ fi 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 \ |