aboutsummaryrefslogtreecommitdiffstats
path: root/build/f_isoroot/f_repobuild/Makefile
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-07-16 20:16:17 +0200
committerMichal Skalski <mskalski@mirantis.com>2016-07-19 01:22:52 +0200
commit0d028383c5b5df7b73683bcdbd7062ef893b6c3f (patch)
treec05645de64d7aa9d909c463a42e74a6a5bdd633c /build/f_isoroot/f_repobuild/Makefile
parent264623809055c5ade26fc615d1255302f0b7c305 (diff)
Build new cache when list of packages has changed
Create a new cache of f_repobuild job when list of packages required by plugins has changed. JIRA: FUEL-150 Change-Id: I079950eaa9e3b32ea7baa3f6d4a37cc37f99f3a7 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Diffstat (limited to 'build/f_isoroot/f_repobuild/Makefile')
-rw-r--r--build/f_isoroot/f_repobuild/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
index cbf81fe4e..8312f5e55 100644
--- a/build/f_isoroot/f_repobuild/Makefile
+++ b/build/f_isoroot/f_repobuild/Makefile
@@ -11,13 +11,9 @@
SHELL := /bin/bash
TOP := $(shell pwd)
TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2)
-# Enable use of exact repo commit if defined, else use Fuel main branch
-FUEL_MIRROR_REPO?=https://github.com/openstack/fuel-mirror
-# Point to the commit where 302 redirects are handled
-# https://bugs.launchpad.net/fuel/mitaka/+bug/1593674
-FUEL_MIRROR_COMMIT?=192a3d9f8f993afb12c5108dd9339c6688c23e11 #$(FUEL_MAIN_TAG)
include ../../config.mk
+include config.mk
export MOS_VERSION
export OPENSTACK_VERSION
@@ -69,6 +65,8 @@ release:nailgun
.cacheid:
date +"Repocache %G%V" > .cachedata
sha1sum Makefile >> .cachedata
+ sha1sum config.mk >> .cachedata
+ $(CACHETOOL) packages >> .cachedata
cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build