Add test pillar for pike
Related-PROD: PROD-22015
Change-Id: Idd57383b39ec5116de9858078bd1aa6345d2e94b
diff --git a/.kitchen.yml b/.kitchen.yml
index 756bc76..e43c008 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,7 +30,7 @@
- linux_repo_openstack
- octavia
pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_openstack.sls
+ linux_repo_openstack.sls: tests/pillar/repo_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.sls
verifier:
name: inspec
@@ -47,15 +47,30 @@
provisioner:
pillars-from-files:
octavia.sls: tests/pillar/api_single.sls
+ pillars:
+ release.sls:
+ octavia:
+ api:
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
- name: api_cluster
provisioner:
pillars-from-files:
octavia.sls: tests/pillar/api_cluster.sls
+ pillars:
+ release.sls:
+ octavia:
+ api:
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
- name: manager_single
provisioner:
pillars-from-files:
octavia.sls: tests/pillar/manager_single.sls
+ pillars:
+ release.sls:
+ octavia:
+ manager:
+ version: <%= ENV['OS_VERSION'] || 'ocata' %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 2982ea2..190f89b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,9 @@
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=api-single
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=api-cluster
- PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=manager-single
+ - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=api-single
+ - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=api-cluster
+ - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=manager-single
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=api-single
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=api-cluster
# - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=manager-single
diff --git a/tests/pillar/repo_openstack.sls b/tests/pillar/repo_openstack_ocata.sls
similarity index 100%
rename from tests/pillar/repo_openstack.sls
rename to tests/pillar/repo_openstack_ocata.sls
diff --git a/tests/pillar/repo_openstack_pike.sls b/tests/pillar/repo_openstack_pike.sls
new file mode 100644
index 0000000..0fbe2e1
--- /dev/null
+++ b/tests/pillar/repo_openstack_pike.sls
@@ -0,0 +1,8 @@
+linux:
+ system:
+ enabled: true
+ repo:
+ mirantis_openstack:
+ source: "deb http://mirror.mirantis.com/stable/openstack-pike/xenial xenial main"
+ architectures: amd64
+ key_url: "http://mirror.mirantis.com/nightly/openstack-pike/xenial/archive-pike.key"