10 files changed, 58 insertions, 31 deletions
diff --git a/build/Makefile b/build/Makefile
index 956183cc6..44cee03be 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -110,8 +110,6 @@ $(ISOCACHE):
 	fi
 	cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
 	@echo "fuel" `git -C /tmp/fuel-main show | grep commit | head -1 | cut -d " " -f2` >> $(VERSION_FILE)
-	# Patch for using the Czech Fuel mirror
-	cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/repo-mirror-cz.patch
 	# Remove Docker optimizations, otherwise multistrap will fail during
 	# Fuel build.
 	sudo rm -f /etc/apt/apt.conf.d/docker*
diff --git a/build/cache.sh b/build/cache.sh
index 7a2a06385..d4b2c45dd 100755
--- a/build/cache.sh
+++ b/build/cache.sh
@@ -21,6 +21,7 @@ trap exit_trap EXIT
 CACHETRANSPORT=${CACHETRANSPORT:-"curl --silent"}
 CACHEMAXAGE=${CACHEMAXAGE:-$[14*24*3600]}
 CACHEDEBUG=${CACHEDEBUG:-1}
+PLUGINS_MATCH="${BUILD_BASE}/f_isoroot/*/"
 
 debugmsg () {
     if [ "$CACHEDEBUG" -eq 1 ]; then
@@ -138,7 +139,22 @@ getcommitid() {
     fi
 }
 
+packages() {
+    local PLUGINS_SHA1=''
 
+    # globbing expansion is alphabetical
+    for plugin in $PLUGINS_MATCH ; do
+        if [ -f "${plugin}packages.yaml" ]
+        then
+            PLUGINS_SHA1+=$(sha1sum ${plugin}packages.yaml)
+        fi
+    done
+
+    if [ -n "${PLUGINS_SHA1}" ]
+    then
+        echo -n $PLUGINS_SHA1 | sha1sum
+    fi
+}
 
 if [ -z "$CACHEBASE" ]; then
   errorexit "CACHEBASE not set - exiting..."
@@ -176,6 +192,12 @@ case $1 in
         $1 $2
         exit $rc
         ;;
+    packages)
+        if [ $# -ne 1 ]; then
+            errorexit "No arguments can be given to packages!"
+        fi
+        packages
+        ;;
     *)
         errorexit "I only know about getcommitid, getid, check, get and put!"
 esac
diff --git a/build/config.mk b/build/config.mk
index af63fcd8f..e3766a7ef 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -9,10 +9,25 @@
 ##############################################################################
 
 FUEL_MAIN_REPO := https://github.com/openstack/fuel-main
-FUEL_MAIN_TAG := 9.0
+FUEL_MAIN_TAG := 9.0.1
 MOS_VERSION = 9.0
 OPENSTACK_VERSION = mitaka-9.0
 
+# Pinning down exact Fuel repo versions for Fuel 9.0.1
+export FUELLIB_COMMIT?=e283b62750d9e26355981b3ad3be7c880944ae0f
+export NAILGUN_COMMIT?=e2b85bafb68c348f25cb7cceda81edc668ba2e64
+export PYTHON_FUELCLIENT_COMMIT?=67d8c693a670d27c239d5d175f3ea2a0512c498c
+export FUEL_AGENT_COMMIT?=7ffbf39caf5845bd82b8ce20a7766cf24aa803fb
+export FUEL_NAILGUN_AGENT_COMMIT?=46fa0db0f8944f9e67699d281d462678aaf4db26
+export ASTUTE_COMMIT?=390b257240d49cc5e94ed5c4fcd940b5f2f6ec64
+export OSTF_COMMIT?=f09c98ff7cc71ee612b2450f68a19f2f9c64345a
+export FUEL_MIRROR_COMMIT?=d1ef06b530ce2149230953bb3810a88ecaff870c
+export FUELMENU_COMMIT?=0ed9e206ed1c6271121d3acf52a6bf757411286b
+export SHOTGUN_COMMIT?=781a8cfa0b6eb290e730429fe2792f2b6f5e0c11
+export NETWORKCHECKER_COMMIT?=fcb47dd095a76288aacf924de574e39709e1f3ca
+export FUELUPGRADE_COMMIT?=c1c4bac6a467145ac4fac73e4a7dd2b00380ecfb
+export FUEL_UI_COMMIT?=90de7ef4477230cb7335453ed26ed4306ca6f04f
+
 DOCKER_REPO := http://get.docker.com/builds/Linux/x86_64
 DOCKER_TAG := docker-latest
 
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
index 3d54e03b2..ba6fb73ff 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
@@ -9,4 +9,4 @@
 
 BGPVPN_BRANCH?=master
 BGPVPN_REPO?="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE?=a2e5cabc2f1e04c948da7026f816549848c2bcd9
+BGPVPN_CHANGE?=3349842af5724be63a74a82c9060848d9d3d299e
diff --git a/build/f_isoroot/f_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index b608adee0..416ed5e4f 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KVMFORNFV_BRANCH=c715b6029fd5b4eaf323f5efde4ec5db5ba0a9b4
+KVMFORNFV_BRANCH=e9bb3d8bce40608c6890ea5298746668b8667462
 KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
 KVMFORNFV_CHANGE=
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
diff --git a/build/f_isoroot/f_repobuild/config.mk b/build/f_isoroot/f_repobuild/config.mk
new file mode 100644
index 000000000..d81732849
--- /dev/null
+++ b/build/f_isoroot/f_repobuild/config.mk
@@ -0,0 +1,13 @@
+##############################################################################
+# Copyright (c) 2016 Ericsson AB and others.
+# mskalski@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+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
diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
index 540f7ebce..4bca6bd9b 100755
--- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
+++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh
@@ -21,7 +21,7 @@ RSYNC="rsync -4 --contimeout 5 --no-motd --list-only"
 # Some Ubuntu mirrors seem less reliable for this type of mirroring -
 # as they are discoved they can be added to the blacklist below in order
 # for them not to be considered.
-BLACKLIST="mirrors.se.eu.kernel.org"
+BLACKLIST="mirrors.se.eu.kernel.org mirror.its.dal.ca"
 
 return_url=0
 
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
index 3db4e9ce2..b87ab6f7c 100644
--- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk
+++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
@@ -8,6 +8,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-YARDSTICK_BRANCH?=55e2e867e9a3f01b39f619251253470948e250d4
+YARDSTICK_BRANCH?=1e6ca0bfaaeadff7ce8ac9b1693b03d122e58a79
 YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
 YARDSTICK_CHANGE?=
diff --git a/build/repo-mirror-cz.patch b/build/repo-mirror-cz.patch
deleted file mode 100644
index aa8eaf9ad..000000000
--- a/build/repo-mirror-cz.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** config.mk.orig	Thu Jan  7 23:30:38 2016
---- config.mk	Thu Jan  7 23:32:36 2016
-***************
-*** 153,159 ****
-  # 'msk', 'srt', 'usa', 'hrk', 'cz'
-  # Setting any other value or removing of this variable will cause
-  # download of all the packages directly from internet
-! USE_MIRROR?=ext
-  
-  ifeq ($(USE_MIRROR),ext)
-  MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
---- 153,159 ----
-  # 'msk', 'srt', 'usa', 'hrk', 'cz'
-  # Setting any other value or removing of this variable will cause
-  # download of all the packages directly from internet
-! USE_MIRROR?=cz
-  
-  ifeq ($(USE_MIRROR),ext)
-  MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/