Set actual package repos for OC 4.1 version in test pillars
Change-Id: Ibb10ccb1c3a55781758bc245267f0d89912e5aa3
Related-PROD: PROD-29438
diff --git a/.kitchen.yml b/.kitchen.yml
index d4e87cf..f504ce2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -66,6 +66,10 @@
init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/single40.sls
+ linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
+ excludes:
+ - trusty-2017.7
+
- name: analytics3
provisioner:
pillars-from-files:
@@ -76,6 +80,10 @@
init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/analytics40.sls
+ linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
+ excludes:
+ - trusty-2017.7
+
- name: control3
provisioner:
pillars-from-files:
@@ -86,6 +94,10 @@
init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/control40.sls
+ linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
+ excludes:
+ - trusty-2017.7
+
- name: cluster3
provisioner:
pillars-from-files:
@@ -96,6 +108,10 @@
init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/cluster40.sls
+ linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
+ excludes:
+ - trusty-2017.7
+
# - name: tor3
# provisioner:
# pillars-from-files:
@@ -104,6 +120,8 @@
# provisioner:
# pillars-from-files:
# opencontrail.sls: tests/pillar/tor40.sls
+ # linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
+
- name: vrouter3
provisioner:
pillars-from-files:
@@ -114,5 +132,8 @@
init: 'systemd'
pillars-from-files:
opencontrail.sls: tests/pillar/vrouter40.sls
+ linux_repo_opencontrail.sls: tests/pillar/repo_opencontrail_oc41.sls
+ excludes:
+ - trusty-2017.7
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/tests/pillar/repo_opencontrail_oc40.sls b/tests/pillar/repo_opencontrail_oc40.sls
deleted file mode 100644
index 98f3056..0000000
--- a/tests/pillar/repo_opencontrail_oc40.sls
+++ /dev/null
@@ -1,12 +0,0 @@
-linux:
- system:
- enabled: true
- repo:
- mcp_opencontrail_repo:
- source: "deb [arch=amd64] http://apt.mirantis.com/{{ grains.get('oscodename') }}/ nightly oc40 extra"
- architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
- pin:
- - pin: 'release a=nightly'
- priority: 1100
- package: '*'
diff --git a/tests/pillar/repo_opencontrail_oc41.sls b/tests/pillar/repo_opencontrail_oc41.sls
new file mode 100644
index 0000000..5c57e46
--- /dev/null
+++ b/tests/pillar/repo_opencontrail_oc41.sls
@@ -0,0 +1,28 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mcp_opencontrail_repo:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/opencontrail-4.1/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/nightly/opencontrail-4.1/{{ grains.get('oscodename') }}/archive-opencontrail-4.1.key"
+ pin:
+ - pin: 'release a=nightly'
+ priority: 1100
+ package: '*'
+ mcp_extra_repo:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/extra/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/nightly/extra/{{ grains.get('oscodename') }}/archive-extra.key"
+ pin:
+ - pin: 'release a=nightly'
+ priority: 1100
+ package: '*'
+ mcp_openstack_ocata:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/nightly/openstack-ocata/{{ grains.get('oscodename') }} {{ grains.get('oscodename') }} main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/nightly/openstack-ocata/{{ grains.get('oscodename') }}/archive-ocata.key"
+ pin:
+ - pin: 'release a=ocata'
+ priority: 1100
+ package: '*'