Drop Travis CI support
Fixes: PROD-25037 (PROD:25037)
Change-Id: I5ad1eb19d855e67026f7ea55a7a64119f49f8f4f
diff --git a/.kitchen.yml b/.kitchen.yml
index b600ee7..d20ebee 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: keystone
@@ -82,38 +82,56 @@
-----BEGIN CERTIFICATE-----
MIIFzzCCA7egAwIBAgIIe7zZ8hCvkgowDQYJKoZIhvcNAQELBQAwSjELMAkGA1UE
-----END CERTIFICATE-----
-
top.sls:
base:
"*":
- linux_repo_openstack
- keystone
- release
- pillars-from-files:
- linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%= ENV['OS_VERSION'] || 'pike' %>.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-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+ image: *xenial-20177
+ platform: ubuntu
+
+ - name: xenial-stable
+ driver_config:
+ image: *xenial-stable
platform: ubuntu
suites:
-
- - name: single
+<% for os_version in ['ocata','pike','queens','rocky'] %>
+<% for mysql_version in ['5.7'] %>
+ - name: single_<%=mysql_version%>_<%=os_version%>
provisioner:
pillars-from-files:
keystone.sls: tests/pillar/single.sls
-
- - name: single_ssl
- provisioner:
- pillars-from-files:
- keystone.sls: tests/pillar/single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
pillars:
+ mysql_platform_specific.sls:
+ mysql:
+ server:
+ version: "<%=mysql_version%>"
+
+ - name: single_ssl_<%=mysql_version%>_<%=os_version%>
+ provisioner:
+ pillars-from-files:
+ keystone.sls: tests/pillar/single.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ mysql_platform_specific.sls:
+ mysql:
+ server:
+ version: "<%=mysql_version%>"
top.sls:
base:
"*":
@@ -122,20 +140,33 @@
- release
- ssl
- - name: single_domain
+ - name: single_domain_<%=mysql_version%>_<%=os_version%>
provisioner:
pillars-from-files:
keystone.sls: tests/pillar/single_domain.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ mysql_platform_specific.sls:
+ mysql:
+ server:
+ version: "<%=mysql_version%>"
- - name: single_fernet
+ - name: single_fernet_<%=mysql_version%>_<%=os_version%>
provisioner:
pillars-from-files:
keystone.sls: tests/pillar/single_fernet.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
+ pillars:
+ mysql_platform_specific.sls:
+ mysql:
+ server:
+ version: "<%=mysql_version%>"
- - name: under-apache
+ - name: under-apache_<%=mysql_version%>_<%=os_version%>
provisioner:
pillars-from-files:
keystone.sls: tests/pillar/apache_wsgi.sls
+ linux_repo_openstack.sls: tests/pillar/repo_mcp_openstack_<%=os_version%>.sls
state_top:
base:
"*":
@@ -143,5 +174,11 @@
- mysql
- apache
- keystone
-
+ pillars:
+ mysql_platform_specific.sls:
+ mysql:
+ server:
+ version: "<%=mysql_version%>"
+<% end %>
+<% 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 0954c32..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,62 +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-formulas:saltstack-ubuntu-trusty-salt-2016.3 MYSQL_VERSION='5.5' SUITE=single
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-trusty-salt-2016.3 MYSQL_VERSION='5.5' SUITE=single_domain
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-trusty-salt-2016.3 MYSQL_VERSION='5.5' SUITE=single_fernet
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-trusty-salt-2016.3 MYSQL_VERSION='5.5' SUITE=under-apache
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata MYSQL_VERSION='5.7' SUITE=single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata MYSQL_VERSION='5.7' SUITE=single_domain
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata MYSQL_VERSION='5.7' SUITE=single_fernet
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=ocata MYSQL_VERSION='5.7' SUITE=under-apache
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike MYSQL_VERSION='5.7' SUITE=single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike MYSQL_VERSION='5.7' SUITE=single_domain
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike MYSQL_VERSION='5.7' SUITE=single_fernet
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike MYSQL_VERSION='5.7' SUITE=under-apache
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=queens MYSQL_VERSION='5.7' SUITE=single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=queens MYSQL_VERSION='5.7' SUITE=single_domain
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=queens MYSQL_VERSION='5.7' SUITE=single_fernet
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=queens MYSQL_VERSION='5.7' SUITE=under-apache
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=rocky MYSQL_VERSION='5.7' SUITE=single
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=rocky MYSQL_VERSION='5.7' SUITE=single_domain
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=rocky MYSQL_VERSION='5.7' SUITE=single_fernet
- - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=rocky MYSQL_VERSION='5.7' SUITE=under-apache
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 MYSQL_VERSION='5.7' SUITE=single
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 MYSQL_VERSION='5.7' SUITE=single_domain
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 MYSQL_VERSION='5.7' SUITE=single_fernet
-# - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 MYSQL_VERSION='5.7' SUITE=under-apache
-
-before_script:
- - set -o pipefail
- - make test | tail
-
-script:
-# - bundle exec kitchen verify single -t tests/integration
- - bundle exec kitchen converge under-apache | tail
- - bundle exec kitchen exec under-apache -c "sudo service mysql start && sudo service apache2 start && keystone-manage db_sync && sleep 1"
-# - bundle exec kitchen verify under-apache -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
diff --git a/tests/pillar/ssl.sls b/tests/pillar/ssl.sls
deleted file mode 100644
index 8e42d8e..0000000
--- a/tests/pillar/ssl.sls
+++ /dev/null
@@ -1,62 +0,0 @@
-# Test case with enabled SSL of the following communication paths:
-# - messaging (rabbitmq)
-
-keystone:
- server:
- enabled: true
- version: liberty
- service_token: token
- service_tenant: service
- admin_tenant: admin
- admin_name: admin
- admin_password: passw0rd
- admin_email: root@localhost
- bind:
- address: 0.0.0.0
- private_address: 127.0.0.1
- private_port: 35357
- public_address: 127.0.0.1
- public_port: 5000
- region: RegionOne
- database:
- engine: mysql
- host: 127.0.0.1
- name: keystone
- password: passw0rd
- user: keystone
- ssl:
- enabled: True
- tokens:
- engine: cache
- expiration: 86400
- location: /etc/keystone/fernet-keys/
- notification: true
- notification_format: cadf
- logging:
- log_appender: false
- log_handlers:
- watchedfile:
- enabled: true
- fluentd:
- enabled: false
- ossyslog:
- enabled: false
- message_queue:
- engine: rabbitmq
- host: 127.0.0.1
- port: 5671
- user: openstack
- password: passw0rd
- virtual_host: '/openstack'
- ha_queues: true
- ssl:
- enabled: True
- cache:
- engine: memcached
- members:
- - host: 127.0.0.1
- port: 11211
- - host: 127.0.0.1
- port: 11211
- - host: 127.0.0.1
- port: 11211