From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 15 Oct 2017 16:27:58 +0000 (+0200)
Subject: reclass: system: Pin Armband apt-mk to nightly ver
X-Git-Tag: opnfv-6.0.0~107^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ada64bbcb86666e792e72413ea2900e8ff60c4b3;p=armband.git

reclass: system: Pin Armband apt-mk to nightly ver

Recently, Mirantis apt-mk repos were changed upstream from using the
'nightly' dist to 'stable'. However, Armband only provides the
'nightly' dist for now, so hardcode our repo definitions to that.

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

diff --git a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
index 828fb600..b99fa735 100644
--- a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
+++ b/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
@@ -27,12 +27,12 @@ index 826969b..01b9cc5 100644
              priority: 1100
              package: '*'
 +        armband_mcp_extra:
-+          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_extra_version} extra"
++          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra"
 +          architectures: arm64
 +          key_url: "http://linux.enea.com/apt-mk/public.gpg"
 +          clean_file: true
 +          pin:
-+          - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
++          - pin: 'release a=nightly'
 +            priority: 1100
 +            package: '*'
 diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
@@ -84,10 +84,10 @@ index 2235b2c..be8ffd2 100644
 +            priority: 1100
 +            package: '*'
 +        armband_mk_openstack:
-+          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
++          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly ${_param:openstack_version}"
 +          architectures: arm64
 +          key_url: "http://linux.enea.com/apt-mk/public.gpg"
 +          pin:
-+          - pin: 'release a=${_param:linux_system_repo_mk_openstack_version}'
++          - pin: 'release a=nightly'
 +            priority: 1100
 +            package: '*'