Merge pull request #3 from Martin819/master
Add Kitchen and Travis
diff --git a/.gitignore b/.gitignore
index aa8e42a..d7f4395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@
*.swp
*.pyc
.ropeproject
+.kitchen
+.bundle
+.vendor
+Gemfile*
+vendor/
diff --git a/.kitchen.yml b/.kitchen.yml
new file mode 100644
index 0000000..00b9cae
--- /dev/null
+++ b/.kitchen.yml
@@ -0,0 +1,55 @@
+---
+driver:
+ name: docker
+ hostname: horizon.ci.local
+ use_sudo: false
+
+provisioner:
+ name: salt_solo
+ salt_install: bootstrap
+ salt_bootstrap_url: https://bootstrap.saltstack.com
+ salt_version: latest
+ require_chef: false
+ log_level: error
+ formula: horizon
+ grains:
+ noservices: True
+ state_top:
+ base:
+ "*":
+ - horizon
+ pillars:
+ top.sls:
+ base:
+ "*":
+ - horizon
+
+verifier:
+ name: inspec
+ sudo: true
+
+platforms:
+ - name: ubuntu-trusty
+ driver_config:
+ image: trevorj/salty-whales:trusty
+ platform: ubuntu
+
+ - name: ubuntu-xenial
+ driver_config:
+ image: trevorj/salty-whales:xenial
+ platform: ubuntu
+
+# - name: centos-7.1
+
+suites:
+
+ - name: cluster
+ provisioner:
+ pillars-from-files:
+ horizon.sls: tests/pillar/cluster.sls
+
+ - name: single
+ provisioner:
+ pillars-from-files:
+ horizon.sls: tests/pillar/single.sls
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5d41eaf
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+sudo: required
+services:
+ - docker
+
+install:
+ - pip install PyYAML
+ - pip install virtualenv
+ - |
+ test -e Gemfile || cat <<EOF > Gemfile
+ source 'https://rubygems.org'
+ gem 'rake'
+ gem 'test-kitchen'
+ gem 'kitchen-docker'
+ gem 'kitchen-inspec'
+ gem 'inspec'
+ gem 'kitchen-salt', :git => 'https://github.com/epcim/kitchen-salt.git', :branch => 'dependencis-pkg-repo2'
+ #Waiting for PR#78
+ #gem 'kitchen-salt', '>=0.2.25'
+ - bundle install
+
+before_script:
+ - make test | tail
+
+script:
+ - test ! -e .kitchen.yml || bundle exec kitchen test
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 2ff2bd6..61a80d2 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -25,6 +25,7 @@
host: 127.0.0.1
port: 5000
api_version: 2
+ encryption: ssl
websso:
login_url: "WEBROOT + 'auth/login/'"
logout_url: "WEBROOT + 'auth/logout/'"
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index f99cc0b..bbb2360 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -22,7 +22,7 @@
engine: keystone
port: 5000
host: 127.0.0.1
- encryption: encryption
+ encryption: ssl
api_version: 2
websso:
login_url: "WEBROOT + 'auth/login/'"