Update Kitchen test configuration
- Add default value for OS_PROJECT_NAME parameter
- Update OS_INTERNAL_NETWORK_ID parameter
- Disable Salt 2018.3 tests
- Sync master and release branch to include all
config changes
Related: PROD-33622
Related: PROD-32744
Related: PROD-33634
Change-Id: Ibeb51e9d40f1db398065b37d9e719dca695959ac
diff --git a/.kitchen.openstack.yml b/.kitchen.openstack.yml
index 073881b..1dcf626 100644
--- a/.kitchen.openstack.yml
+++ b/.kitchen.openstack.yml
@@ -5,23 +5,22 @@
openstack_api_key: <%= ENV['OS_PASSWORD'] %>
openstack_auth_url: <%= ENV['OS_AUTH_URL'] %>
openstack_domain_name: <%= ENV['OS_DOMAIN_NAME'] %>
- openstack_project_name: <%= ENV['OS_PROJECT_NAME'] %>
+ openstack_project_name: <%= ENV['OS_PROJECT_NAME' || 'sre-team'] %>
openstack_identity_api_version: 3
availability_zone: <%= ENV['OS_AZ'] || 'nova' %>
openstack_network_name: <%= ENV['OS_FLOATING_NETWORK_NAME'] || 'public' %>
security_groups:
- kitchen
- network_id: <%= ENV['OS_INTERNAL_NETWORK_ID'] || '2d161ac2-1687-459e-921a-8f7a82a36b5e' %>
+ network_id: <%= ENV['OS_INTERNAL_NETWORK_ID'] || '2d784b89-aa6f-43f8-a2b2-352c48f56b71' %>
user_data: user_data.sh
require_chef_omnibus: false
floating_ip_pool: <%= ENV['OS_FLOATING_NETWORK_NAME'] || 'public' %>
allocate_floating_ip: true
- image_id: <%= ENV['OS_IMAGE_ID'] %>
- flavor_id: <%= ENV['OS_FLAVOR_ID'] || 'ac2a36af-f9a0-4af7-8220-e85cff4d2bce' %>
- server_name: <%= ENV['SUITE'] %>-ubuntu-<%= ENV['UBUNTU_VERSION'].gsub ".","_" %>-salt-<%= ENV['SALT_VERSION'].gsub ".","_" %>
+ flavor_id: <%= ENV['OS_FLAVOR_ID'] || '13f2c9bc-1f97-441c-96f1-caba1a82b734' %>
read_timeout: 720
write_timeout: 720
connect_timeout: 360
+ mcp_ruby_version: '2.5.0'
transport:
username: kitchen
@@ -29,13 +28,12 @@
connection_timeout: 10
connection_retries: 60
-provisioner:
- name: salt_solo
+salt_config: &salt_config
salt_install: bootstrap
salt_bootstrap_url: https://bootstrap.saltstack.com
- salt_version: <%= ENV['SALT_VERSION'] %>
- salt_apt_repo_key: https://repo.saltstack.com/apt/ubuntu/<%= ENV['UBUNTU_VERSION'] || '16.04' %>/amd64/latest/SALTSTACK-GPG-KEY.pub
- salt_apt_repo: https://repo.saltstack.com/apt/ubuntu/<%= ENV['UBUNTU_VERSION'] || '16.04' %>/amd64/
+
+provisioner:
+ name: salt_solo
require_chef: false
log_level: info
formula: iptables
@@ -54,10 +52,29 @@
sudo: true
platforms:
- - name: saltstack-ubuntu-<%= ENV['UBUNTU_DISTRO'] || 'xenial' %>-salt-<%= ENV['SALT_VERSION'] || '2018.3.0' %>
+<% for salt_version in ['2017.7.8'] %>
+ - name: saltstack-ubuntu-xenial-salt-<%=salt_version.gsub(".","_")%>
+ driver:
+ image_id: 'a64f6d20-167d-4b67-9dd6-bbfc5f7e1859'
+ server_name: test-drivetrain-formula-iptables-ubuntu-16_04-salt-<%=salt_version.gsub(".","_")%>
+ provisioner:
+ <<: *salt_config
+ salt_version: <%=salt_version%>
+ salt_apt_repo_key: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+ salt_apt_repo: https://repo.saltstack.com/apt/ubuntu/16.04/amd64/
+ - name: saltstack-ubuntu-bionic-salt-<%=salt_version.gsub(".","_")%>
+ driver:
+ image_id: '0c681b14-0034-447b-9379-75fad4d6fa56'
+ server_name: test-drivetrain-formula-iptables-ubuntu-18_04-salt-<%=salt_version.gsub(".","_")%>
+ provisioner:
+ <<: *salt_config
+ salt_version: <%=salt_version%>
+ salt_apt_repo_key: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+ salt_apt_repo: https://repo.saltstack.com/apt/ubuntu/18.04/amd64/
+<% end %>
suites:
- name: iptables
provisioner:
pillars-from-files:
- iptables.sls: tests/pillar/iptables.sls
+ iptables.sls: tests/pillar/iptables.sls
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ae41d0b..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-language: python
-python:
-- "2.7.13"
-sudo: required
-services:
- - docker
-
-install:
- - pip install PyYAML
- - pip install virtualenv
- - |
- if [ ! -e Gemfile ]; then
- echo $PWD
- 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:
- - UBUNTU_DISTRO=xenial UBUNTU_VERSION=16.04 OS_AZ=mcp-mk OS_IMAGE_ID=60878bd4-cb4a-4d71-ae02-2a8ee4476d10 SALT_VERSION='2018.3.3' SUITE=iptables
- - UBUNTU_DISTRO=xenial UBUNTU_VERSION=16.04 OS_AZ=mcp-mk OS_IMAGE_ID=60878bd4-cb4a-4d71-ae02-2a8ee4476d10 SALT_VERSION='2017.7.6' SUITE=iptables
- - UBUNTU_DISTRO=bionic UBUNTU_VERSION=18.04 OS_AZ=mcp-mk OS_IMAGE_ID=d9e69f28-5adc-4f2b-a084-4714454ead0a SALT_VERSION='2018.3.3' SUITE=iptables
- - UBUNTU_DISTRO=bionic UBUNTU_VERSION=18.04 OS_AZ=mcp-mk OS_IMAGE_ID=d9e69f28-5adc-4f2b-a084-4714454ead0a SALT_VERSION='2017.7.6' SUITE=iptables
-
-before_script:
- - set -o pipefail
- - make test | tail
-
-script:
- - test ! -e .kitchen.openstack.yml || bundle exec kitchen converge ${SUITE} || true
- - test ! -e .kitchen.openstack.yml || bundle exec kitchen verify ${SUITE} -t tests/integration
-
-notifications:
- on:
- branch: master
- 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