summaryrefslogtreecommitdiffstats
path: root/build/Makefile
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2016-12-08 23:40:35 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2016-12-08 23:40:35 +0400
commit93fa5e80104a18bee70b24b38b4743008d161920 (patch)
tree62cc45362c147b85489cd4431681cfbf39a4f97e /build/Makefile
parentf7ba9d618c7f78ef5f452f82419136a7f024c570 (diff)
Point to latest repos of fuel 10/newton
Since swarm tests have been enabled against 10.0 so get the latest repositories into build. Change-Id: Ie24e51dbc2e80ef61dd9d892cd0083a594fd289e Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'build/Makefile')
-rw-r--r--build/Makefile13
1 files changed, 5 insertions, 8 deletions
diff --git a/build/Makefile b/build/Makefile
index e836de117..c8fc79385 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -57,14 +57,11 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" |
export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
-# Short circuiting normal package selection as this seems currently broken, see
-# hard coding in config.mk
-# export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
-# export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
-# export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
-# export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
-# export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
-# export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
+export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
+export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
+export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
+export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
+export MIRROR_FUEL := "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/$(LATEST_TARGET_CENTOS)/x86_64"
# uncomment and use: make print-VARIABLE
#print-% : ; @echo $* = $($*)