Skip to content

Commit

Permalink
Merge pull request #392 from aboe76/travis_integration
Browse files Browse the repository at this point in the history
add initial travis integration
  • Loading branch information
noelmcloughlin authored Dec 22, 2018
2 parents ec7984c + 45394fe commit d370f88
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 0 deletions.
76 changes: 76 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
---
driver:
name: docker

driver_config:
use_sudo: false
privileged: true
provision_command: mkdir -p /run/sshd
run_command: /lib/systemd/systemd

platforms:
- name: debian-9
driver_config:
provision_command:
- apt-get install udev net-tools -y
- name: ubuntu-18.04
driver_config:
provision_command:
- apt-get install udev net-tools -y
- name: centos-7
driver_config:
provision_command:
- yum install udev net-tools -y

provisioner:
name: salt_solo
log_level: info
require_chef: false
salt_version: latest
formula: salt
salt_copy_filter:
- .kitchen
- .git
pillars:
top.sls:
base:
'*':
- salt
salt.sls:
salt:
master:
fileserver_backend:
- rootfs
file_roots:
base:
- /srv/salt
pillar_roots:
base:
- /srv/pillar
minion:
master: localhost
fileserver_backend:
- rootfs
file_roots:
base:
- /srv/salt
pillar_roots:
base:
- /srv/pillar

verifier:
name: inspec
sudo: true
reporter:
- cli
inspec_tests:
- path: test/integration/default

suites:
- name: salt
provisioner:
state_top:
base:
'*':
- salt.master
- salt.minion
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
sudo: required
cache: bundler
language: ruby

services:
- docker

before_install:
- bundle install

env:
matrix:
- INSTANCE: salt-debian-9
- INSTANCE: salt-ubuntu-1804
- INSTANCE: salt-centos-7

script:
- bundle exec kitchen verify ${INSTANCE}

7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
source "https://rubygems.org"

gem "test-kitchen", '>=1.23.2'
gem "kitchen-docker"
gem "kitchen-salt", ">=0.2.5"
gem "kitchen-inspec"

4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
salt
====

.. image:: https://travis-ci.com/saltstack-formulas/salt-formula.svg?branch=master
:target: https://travis-ci.com/saltstack-formulas

Yes, Salt can Salt itself!

.. note::

See the full `Salt Formulas installation and usage instructions
<http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html>`_.


Available states
================

Expand Down
11 changes: 11 additions & 0 deletions test/integration/default/pkgs_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
control 'salt packages' do
title 'should be installed'

describe package('salt-master') do
it { should be_installed }
end

describe package('salt-minion') do
it { should be_installed }
end
end
14 changes: 14 additions & 0 deletions test/integration/default/service_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
control 'salt services' do
title 'should be running'

describe service('salt-master') do
it { should be_enabled }
it { should be_running }
end

describe service('salt-minion') do
it { should be_enabled }
it { should be_running }
end

end

0 comments on commit d370f88

Please sign in to comment.