Merge "Drop Travis CI support"
diff --git a/.kitchen.yml b/.kitchen.yml
index 1bb0668..742fc5f 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
name: salt_solo
salt_install: bootstrap
salt_bootstrap_url: https://bootstrap.saltstack.com
- salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
+ salt_version: latest
require_chef: false
log_level: error
formula: cinder
@@ -17,13 +17,13 @@
dependencies:
- name: linux
repo: git
- source: https://github.com/salt-formulas/salt-formula-linux
+ source: https://gerrit.mcp.mirantis.com/salt-formulas/linux
- name: apache
repo: git
- source: https://github.com/salt-formulas/salt-formula-apache
+ source: https://gerrit.mcp.mirantis.com/salt-formulas/apache
- name: keystone
repo: git
- source: https://github.com/salt-formulas/salt-formula-keystone
+ source: https://gerrit.mcp.mirantis.com/salt-formulas/keystone
state_top:
base:
"*":
@@ -37,95 +37,185 @@
- linux_repo_openstack
- cinder
- release
- release.sls:
- cinder:
- controller:
- version: <%= ENV['OS_VERSION'] || 'ocata' %>
- volume:
- version: <%= ENV['OS_VERSION'] || 'ocata' %>
- pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'ocata' %>.sls
verifier:
name: inspec
sudo: true
+docker_images:
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
+ - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+
platforms:
- - name: <%=ENV['PLATFORM'] || 'saltstack-ubuntu-xenial-salt-stable' %>
+ - name: xenial-2017.7
driver_config:
- image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
+ image: *xenial-20177
+ platform: ubuntu
+
+ - name: xenial-stable
+ driver_config:
+ image: *xenial-stable
platform: ubuntu
suites:
-
- - name: ceph_single
+<% for os_version in ['mitaka','ocata','pike'] %>
+ - name: ceph_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/ceph_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: control_cluster
+ - name: control_cluster_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/control_cluster.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
cinder:
+ controller:
+ version: <%=os_version%>
volume:
enabled: false
+ version: <%=os_version%>
- - name: control_single
+ - name: control_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/control_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
release.sls:
cinder:
+ controller:
+ version: <%=os_version%>
volume:
enabled: false
+ version: <%=os_version%>
- - name: control_cluster
+ - name: control_cluster_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/control_cluster_intree_wsgi.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: gpfs_single
+ - name: gpfs_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/gpfs_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: hp3par_single
+ - name: hp3par_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/hp3par_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: lefthand_single
+ - name: lefthand_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/lefthand_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: solidfire_single
+ - name: solidfire_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/solidfire_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: storwize_single
+ - name: storwize_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/storwize_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: volume_single
+ - name: volume_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/volume_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: vsp_single
+ - name: vsp_single_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/vsp_single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
- - name: volume_single_barbican
+ - name: volume_single_barbican_<%=os_version%>
provisioner:
pillars-from-files:
cinder.sls: tests/pillar/volume_single_barbican.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ release.sls:
+ cinder:
+ controller:
+ version: <%=os_version%>
+ volume:
+ version: <%=os_version%>
+<% end %>
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ac14c86..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
- - docker
-
-install:
- - pip install PyYAML
- - pip install virtualenv
- - |
- if [ ! -e Gemfile ]; then
- curl -s -o ./Gemfile 'https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas/salt-formulas-scripts.git;a=blob_plain;f=Gemfile;hb=refs/heads/master'
- fi
- - bundle install
-
-env:
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=ceph-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=control-cluster
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=control-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=gpfs-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=lefthand-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=storwize-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata SUITE=volume-single-barbican
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=ceph-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=control-cluster
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=control-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=hp3par-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=solidfire-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=volume-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=vsp-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=ceph-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=control-cluster
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=control-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=hp3par-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=solidfire-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=volume-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=ocata SUITE=vsp-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=ceph-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=control-cluster
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=control-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=gpfs-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=lefthand-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=storwize-single
- - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 OS_VERSION=pike SUITE=volume-single-barbican
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=ceph-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=control-cluster
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=control-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=hp3par-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=solidfire-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=volume-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=ocata SUITE=vsp-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=ceph-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=control-cluster
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=control-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=gpfs-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=lefthand-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=storwize-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 OS_VERSION=pike SUITE=volume-single-barbican
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=ceph-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=control-cluster
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=control-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=hp3par-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=solidfire-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=volume-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=ocata SUITE=vsp-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=ceph-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=control-cluster
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=control-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=gpfs-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=lefthand-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=storwize-single
- # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 OS_VERSION=pike SUITE=volume-single-barbican
-
-before_script:
- - set -o pipefail
- - make test | tail
-
-script:
- - test ! -e .kitchen.yml || bundle exec kitchen converge ${SUITE} || true
- - test ! -e .kitchen.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
- webhooks:
- urls:
- - https://webhooks.gitter.im/e/6123573504759330786b
- on_success: change # options: [always|never|change] default: always
- on_failure: never # options: [always|never|change] default: always
- on_start: never # options: [always|never|change] default: always
- on_cancel: never # options: [always|never|change] default: always
- on_error: never # options: [always|never|change] default: always
- email: false