BUILD_ID: Fix git SHA one last time.

Previous commit which was supposed to fix the BUILD_ID being too
long mistakenly altered the submodule code for computing the
short SHA, instead of altering the Makefile.

Fixes: ARMBAND-53

Change-Id: Ib1c1b3dc9592714fd86a59ae1a64001bd2930bd3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/Makefile b/Makefile
index 2dbf769..b572367 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ build:
                        BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
                        UBUNTU_ARCH="amd64 arm64" \
                        PRODNO="OPNFV_ARMBAND_FUEL" \
-                       OPNFV_GIT_SHA=$(shell git rev-parse HEAD) \
+                       OPNFV_GIT_SHA=$(shell git rev-parse --short HEAD) \
                        ASTUTE_REPO=${root}/upstream/fuel-astute \
                        ASTUTE_COMMIT=HEAD \
                        NAILGUN_REPO=${root}/upstream/fuel-web \

diff --git a/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch b/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
index 2bcc81d..1c9bd82 100644 (file)
--- a/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
+++ b/patches/opnfv-fuel/0015-build-Makefile-Overrideable-product-commit-hash.patch
@@ -29,7 +29,7 @@ index ec5d27a..ba117da 100644
  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 --short 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)