From fe3fc91c23ace520f32830b6af5205c39088f922 Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Mon, 17 Oct 2016 17:43:36 +0200 Subject: Point to specific snapshot of mos repositories Fuel 9.1 was released, it is a first time when new version of Fuel is distributed through the same repositories as previous one, point to specific snaphost of mos ubuntu repo to prevent mixing packages. Change-Id: I64bb52657ce476b0c1fdc8e858231ad751ba12b1 Signed-off-by: Michal Skalski --- build/Makefile | 4 +++- build/f_isoroot/f_repobuild/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/Makefile b/build/Makefile index ac854986c..fadb8a8ba 100644 --- a/build/Makefile +++ b/build/Makefile @@ -58,7 +58,9 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" | export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py) 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 := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1) +# Fuel 9.0 +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) diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index ad1a934fa..8beb8824f 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -53,9 +53,9 @@ release:nailgun @cp -Rp nailgun ../release/opnfv/nailgun @cp fuel_bootstrap_cli.yaml ../release/opnfv/ -############################################################################# +############################################################################ # Cache operations - only used when building through ci/build.sh -############################################################################# +############################################################################ # Create a unique hash to be used for getting and putting cache, based on: # - Year and week (causing the cache to be rebuilt weekly) -- cgit 1.2.3-korg