patches/opnfv-fuel/0002-Revert-Point-to-specific-snapshot-of-mos-repositorie.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 18 Oct 2016 12:26:10 +0200
   3 Subject: [PATCH] Revert "Point to specific snapshot of mos repositories"
   4
   5 Armband does not publish snapshots yet.
   6
   7 This reverts commit fe3fc91c23ace520f32830b6af5205c39088f922.
   8 ---
   9  build/Makefile                       | 4 +---
  10  build/f_isoroot/f_repobuild/Makefile | 4 ++--
  11  2 files changed, 3 insertions(+), 5 deletions(-)
  12
  13 diff --git a/build/Makefile b/build/Makefile
  14 index 5069def..59fa918 100644
  15 --- a/build/Makefile
  16 +++ b/build/Makefile
  17 @@ -63,9 +63,7 @@ export MIRROR_UBUNTU_ROOT := $(shell echo -n '/' ; echo "$(MIRROR_UBUNTU_URL)" |
  18  export LATEST_MIRROR_ID_URL := http://$(shell ./select_closest_fuel_mirror.py)
  19
  20  export MIRROR_MOS_UBUNTU ?= $(shell echo "$(LATEST_MIRROR_ID_URL)" | cut -d'/' -f3)
  21 -#export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
  22 -# Fuel 9.0
  23 -export LATEST_TARGET_UBUNTU := snapshots/9.0-2016-06-23-164100-copy
  24 +export LATEST_TARGET_UBUNTU := $(shell curl -sSf "$(MIRROR_MOS_UBUNTU)/mos-repos/ubuntu/$(MOSVERSION).target.txt" | head -1)
  25  export MIRROR_MOS_UBUNTU_ROOT := /mos-repos/ubuntu/$(LATEST_TARGET_UBUNTU)
  26
  27  export LATEST_TARGET_CENTOS := $(shell curl -sSf "$(LATEST_MIRROR_ID_URL)/mos-repos/centos/mos$(MOSVERSION)-centos7/os.target.txt" | head -1)
  28 diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
  29 index 8beb882..ad1a934 100644
  30 --- a/build/f_isoroot/f_repobuild/Makefile
  31 +++ b/build/f_isoroot/f_repobuild/Makefile
  32 @@ -53,9 +53,9 @@ release:nailgun
  33         @cp -Rp nailgun ../release/opnfv/nailgun
  34         @cp fuel_bootstrap_cli.yaml ../release/opnfv/
  35
  36 -############################################################################
  37 +#############################################################################
  38  # Cache operations - only used when building through ci/build.sh
  39 -############################################################################
  40 +#############################################################################
  41
  42  # Create a unique hash to be used for getting and putting cache, based on:
  43  #   - Year and week (causing the cache to be rebuilt weekly)