summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-18 12:30:47 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-18 11:51:41 +0000
commit067261a502ca5aef0992ed0c0af024ca77763efd (patch)
tree26825b54bed407cc69728421e964cfe67e96803a /patches
parent16db915ab9c8d5e78cbcba2f6c306710fb1626a2 (diff)
FIXME: build: Revert using mirror snapshots
Armband does not yet have DEB/RPM repo snapshots, so revert upstream Fuel@OPNFV change enabling them. JIRA: ARMBAND-155 Change-Id: Ib08c36bf28a66ef38d8b33031dcbf363fb34123c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7684dd13589cab6860e514a9c3b8043666c818da)
Diffstat (limited to 'patches')
-rw-r--r--patches/opnfv-fuel/0002-Revert-Point-to-specific-snapshot-of-mos-repositorie.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0002-Revert-Point-to-specific-snapshot-of-mos-repositorie.patch b/patches/opnfv-fuel/0002-Revert-Point-to-specific-snapshot-of-mos-repositorie.patch
new file mode 100644
index 00000000..05f9e123
--- /dev/null
+++ b/patches/opnfv-fuel/0002-Revert-Point-to-specific-snapshot-of-mos-repositorie.patch
@@ -0,0 +1,43 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 18 Oct 2016 12:26:10 +0200
+Subject: [PATCH] Revert "Point to specific snapshot of mos repositories"
+
+Armband does not publish snapshots yet.
+
+This reverts commit fe3fc91c23ace520f32830b6af5205c39088f922.
+---
+ build/Makefile | 4 +---
+ build/f_isoroot/f_repobuild/Makefile | 4 ++--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/build/Makefile b/build/Makefile
+index 5069def..59fa918 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -63,9 +63,7 @@ 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)
+-# Fuel 9.0
+-export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
++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)
+diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
+index 8beb882..ad1a934 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)