From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 16 Nov 2016 19:32:06 +0000 (+0100)
Subject: build: Add local Ubuntu mirror to target image
X-Git-Tag: danube.1.RC1~79
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F24441%2F1;hp=4723a68345dc5f685dd54dda7fe2659dd794f9a5;p=armband.git

build: Add local Ubuntu mirror to target image

When deploying via Jenkins CI, the repos used for target image
building are overridden to use the local Ubuntu mirror on Fuel
Master instead of fetching packages from internet.

However, when deploying manually, only bootstrap image building
benefits from the local Ubuntu mirror.

While keeping the internet mirrors, add the local Ubuntu mirror
to target image build repo list.

JIRA: ARMBAND-35

Change-Id: Ibd58067703ce6370781a6b54fd01ce52e29686ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
index 6dee64d9..54652af4 100644
--- a/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
+++ b/patches/fuel-web/0001-nailgun-Add-AArch64-Openstack-Mitaka-release-s.patch
@@ -17,7 +17,7 @@ diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/
 index d08a4fc..65646d4 100644
 --- a/nailgun/nailgun/fixtures/openstack.yaml
 +++ b/nailgun/nailgun/fixtures/openstack.yaml
-@@ -2314,3 +2314,290 @@
+@@ -2314,3 +2314,302 @@
              weight: 61
              type: "checkbox"
              value: true
@@ -50,6 +50,12 @@ index d08a4fc..65646d4 100644
 +              For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-9.0/operations.html#external-ubuntu-ops).
 +            value:
 +              - type: "deb"
++                name: "ubuntu-local"
++                uri: "http://{settings.MASTER_IP}:8080/ubuntu/x86_64"
++                suite: "trusty"
++                section: "main"
++                priority: null
++              - type: "deb"
 +                name: "ubuntu"
 +                uri: "http://ports.ubuntu.com/"
 +                suite: "trusty"
@@ -227,6 +233,12 @@ index d08a4fc..65646d4 100644
 +              For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-9.0/operations.html#external-ubuntu-ops).
 +            value:
 +              - type: "deb"
++                name: "ubuntu-local"
++                uri: "http://{settings.MASTER_IP}:8080/ubuntu/x86_64"
++                suite: "trusty"
++                section: "main"
++                priority: null
++              - type: "deb"
 +                name: "ubuntu"
 +                uri: "http://ports.ubuntu.com/"
 +                suite: "trusty"