summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-02-06 17:40:27 +0100
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-02-06 19:20:14 +0100
commit27362a1861d02b0bb0ca327c333e5e58a060ad1d (patch)
treee2c82bed846168aee423db6336a0c18770091b57
parent0193ea1dbe4c8c3c097e6953f38877ce4864e96e (diff)
Enable use of Fuel library commit ids for mirror
If FUEL_MIRROR_COMMIT is set (indicating a pinning of all Fuel repositories), use that one instead of FUEL_MAIN_TAG. Change-Id: I4af82cf63f8e846d757a583836fce8bb78d93906 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
-rw-r--r--build/f_isoroot/f_repobuild/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
index 27eb05eeb..455caf263 100644
--- a/build/f_isoroot/f_repobuild/Makefile
+++ b/build/f_isoroot/f_repobuild/Makefile
@@ -12,6 +12,8 @@ SHELL := /bin/bash
TOP := $(shell pwd)
UBUNTU_DIR := $(shell dirname $(MIRROR_UBUNTU_ROOT))
TMP_ROOT_DIR := $(shell echo "$(UBUNTU_DIR)" | cut -d "/" -f2)
+# Enable use of exact repo commit if defined, else use Fuel main branch
+FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG)
include ../../config.mk
@@ -25,7 +27,8 @@ nailgun:
sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml
rm -Rf nailgun
sudo mkdir -p /var/www/nailgun
- git clone -b $(FUEL_MAIN_TAG) https://github.com/openstack/fuel-mirror
+ git clone https://github.com/openstack/fuel-mirror
+ cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
sudo pip install -U -r ./fuel-mirror/requirements.txt
sudo pip install ./fuel-mirror
sudo pip install ./fuel-mirror/contrib/fuel_mirror