diff options
| -rw-r--r-- | build/Makefile | 13 | ||||
| -rw-r--r-- | build/config.mk | 17 |
2 files changed, 5 insertions, 25 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 $* = $($*) diff --git a/build/config.mk b/build/config.mk index 6297a271e..56317cb78 100644 --- a/build/config.mk +++ b/build/config.mk @@ -33,23 +33,6 @@ F_OPNFV_TAG := ${FUEL_MAIN_TAG}-opnfv FUEL_MAIN_REPO := ${F_SUBMOD_DIR}/fuel-main - -# Settings for Fuel 10 BEGIN -# -# Currently it seems impossible to build Fuel 10 from upstream without -# hard coding specific repositories. The Fuel Ubuntu mirror seems to not -# have been fully populated. - -export MIRROR_UBUNTU?=cz.archive.ubuntu.com -export MIRROR_UBUNTU_ROOT?=/ubuntu/ -export MIRROR_MOS_UBUNTU?=mirror.seed-cz1.fuel-infra.org -export MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/xenial//snapshots/master-2016-10-10-100022 -export MIRROR_CENTOS?=http://mirror.seed-cz1.fuel-infra.org/pkgs/snapshots/centos-7.2.1511-2016-08-07-170016 -export MIRROR_FUEL?=http://mirror.seed-cz1.fuel-infra.org//mos-repos/centos/mos-master-centos7//snapshots/os-2016-10-18-120021/x86_64 -export MIRROR_MOS_UBUNTU_SUITE?=mos-master - -# Settings for Fuel 10 END - export FUELLIB_REPO?=${F_SUBMOD_DIR}/fuel-library export NAILGUN_REPO?=${F_SUBMOD_DIR}/fuel-web export PYTHON_FUELCLIENT_REPO?=${F_SUBMOD_DIR}/python-fuelclient |