summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-10-17 17:43:36 +0200
committerMichal Skalski <mskalski@mirantis.com>2016-10-18 07:33:12 +0000
commitf17b9de605c09226f6ce8d49476ce8ba139c22d8 (patch)
treed9cf1132b5c8159dd65e5e4c4a3aa1fc774e1301
parent4cbdc59a2c2c87a489473bcda065c314f2d80d33 (diff)
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 <mskalski@mirantis.com> (cherry picked from commit fe3fc91c23ace520f32830b6af5205c39088f922)
-rw-r--r--build/Makefile4
-rw-r--r--build/f_isoroot/f_repobuild/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/build/Makefile b/build/Makefile
index 661505d9b..b7605684e 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 7c6b16304..ffd4208f4 100644
--- a/build/f_isoroot/f_repobuild/Makefile
+++ b/build/f_isoroot/f_repobuild/Makefile
@@ -55,9 +55,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)