jjb/snapshot-jjb-container: add BUILD_ID in docker image version

Bug-AGL: SPEC-979, SPEC-1379

Change-Id: I2d5032f75672978c7dfd6b43159cd170efd8fb38
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>

diff --git a/jjb/snapshot-jjb-container/include-createcontainer.sh b/jjb/snapshot-jjb-container/include-createcontainer.sh
index fec19db..a01ac9f 100644 (file)
--- a/jjb/snapshot-jjb-container/include-createcontainer.sh
+++ b/jjb/snapshot-jjb-container/include-createcontainer.sh
@@ -10,8 +10,12 @@ cd docker-worker-generator/
 # dump where we are in jenkins log :)
 git log -n 1
 
-make build
-make export
+# add Jenkins BUILD_ID in image version
+FULLVER=$(cat VERSION)-${BUILD_ID}
+
+# override VERSION variable when invoking make to build and export docker image
+make VERSION=$FULLVER build
+make VERSION=$FULLVER export
 
 ls
 
@@ -19,6 +23,8 @@ echo "###########################"
 
 mkdir -p ../container
 mv docker_agl_worker*.tar.xz ../container/
+
+# workaround due to SPEC-979
 ln -s $(basename ../container/docker_agl_worker*.tar.xz) ../container/docker_agl_worker-latest.tar.xz
 
 ls ../container