summaryrefslogtreecommitdiffstats
path: root/build/config.mk
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-10-12 16:42:35 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-11-15 15:35:15 +0100
commit9f8aff6636e0d86834178b461802f3e7cb95189d (patch)
tree3bbfec85cda9774295b5f30f8417ee36e512368d /build/config.mk
parent38579142c683dbf26a6560d53d900111f4df4f6b (diff)
Uplift to Fuel 10.0/Newton
Build working, automated deploy working (simple test cases only). All plugins disabled, so is the generation of the local ISO cache. Both need to be re-enabled after merge of this uplift. All patches wiped, pertinent ones need to be re-enabled after the merge of this uplift. Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/config.mk')
-rw-r--r--build/config.mk28
1 files changed, 21 insertions, 7 deletions
diff --git a/build/config.mk b/build/config.mk
index ab278589e..6297a271e 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -13,12 +13,10 @@
# remotes, ALL submodules will point to remote branch HEAD).
# NOTE: Pinning fuel-main or other submodules to a specific commit/tag is
# done ONLY via git submodules.
-FUEL_MAIN_TAG = 9.0.1
-MOS_VERSION = 9.0
-OPENSTACK_VERSION = mitaka-9.0
+FUEL_MAIN_TAG = master
+MOS_VERSION = 10.0
+OPENSTACK_VERSION = newton-10.0
-# FIXME(alav): Disable remote tracking for now, stick to submodule commits
-FUEL_TRACK_REMOTES =
##############################################################################
# Fuel components pinning / remote tracking; use submodules from f_repos
@@ -34,6 +32,24 @@ F_OPNFV_TAG := ${FUEL_MAIN_TAG}-opnfv
# fuel-main repo location used by main Makefile ISO building, use submodule
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
@@ -41,11 +57,9 @@ export FUEL_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-agent
export FUEL_NAILGUN_AGENT_REPO?=${F_SUBMOD_DIR}/fuel-nailgun-agent
export ASTUTE_REPO?=${F_SUBMOD_DIR}/fuel-astute
export OSTF_REPO?=${F_SUBMOD_DIR}/fuel-ostf
-export FUEL_MIRROR_REPO?=${F_SUBMOD_DIR}/fuel-mirror
export FUELMENU_REPO?=${F_SUBMOD_DIR}/fuel-menu
export SHOTGUN_REPO?=${F_SUBMOD_DIR}/shotgun
export NETWORKCHECKER_REPO?=${F_SUBMOD_DIR}/network-checker
-export FUELUPGRADE_REPO?=${F_SUBMOD_DIR}/fuel-upgrade
export FUEL_UI_REPO?=${F_SUBMOD_DIR}/fuel-ui
# OPNFV tags are automatically applied by `make -C f_repos patches-import`