diff options
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index bc6a9418c..01f6e414a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -123,7 +123,7 @@ $(ISOCACHE): cd /tmp/fuel-main && make repos $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt # Repeat build up to ten times - sudo ./fuel_build_loop + sudo -E ./fuel_build_loop cp /tmp/fuel-main/build/artifacts/fuel*.iso . # Store artifact in cache straight away if caching is enabled # (no .cacheid will be present unless this is a cached build) 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 |