Update test pillars, Added Kitchen tests and Travis
diff --git a/.kitchen.yml b/.kitchen.yml
new file mode 100644
index 0000000..8eb54f9
--- /dev/null
+++ b/.kitchen.yml
@@ -0,0 +1,45 @@
+---
+driver:
+ name: docker
+ hostname: java.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: java
+ grains:
+ noservices: True
+ state_top:
+ base:
+ "*":
+ - java
+ pillars:
+ top.sls:
+ base:
+ "*":
+ - java
+
+verifier:
+ name: inspec
+ sudo: true
+
+
+platforms:
+ - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+ driver_config:
+ image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+ platform: ubuntu
+
+suites:
+
+ - name: <%=ENV['SUITE'] || 'openjdk-8'%>
+ provisioner:
+ pillars-from-files:
+ java.sls: tests/pillar/<%=ENV['SUITE'] || 'openjdk-8'%>.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..7271d6d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,41 @@
+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/salt-formulas/kitchen-salt.git'
+ - bundle install
+
+env:
+ - SUITE=openjdk-7 PLATFORM=trevorj/salty-whales:trusty
+ - SUITE=oracle-jdk-7 PLATFORM=trevorj/salty-whales:trusty
+ - SUITE=openjdk-8 PLATFORM=trevorj/salty-whales:xenial
+ - SUITE=oracle-jdk-8 PLATFORM=trevorj/salty-whales:xenial
+
+before_script:
+ - set -o pipefail
+ - make test | tail
+
+script:
+ - test ! -e .kitchen.yml || bundle exec kitchen test -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/java/environment/oracle.yml b/java/environment/oracle.sls
similarity index 100%
rename from java/environment/oracle.yml
rename to java/environment/oracle.sls
diff --git a/tests/pillar/java_server.sls b/tests/pillar/openjdk-7.sls
similarity index 98%
rename from tests/pillar/java_server.sls
rename to tests/pillar/openjdk-7.sls
index 655ce6b..2889e95 100644
--- a/tests/pillar/java_server.sls
+++ b/tests/pillar/openjdk-7.sls
@@ -4,4 +4,3 @@
version: '7'
platform: openjdk
development: true
-
diff --git a/tests/pillar/java_server.sls b/tests/pillar/openjdk-8.sls
similarity index 81%
copy from tests/pillar/java_server.sls
copy to tests/pillar/openjdk-8.sls
index 655ce6b..05fe179 100644
--- a/tests/pillar/java_server.sls
+++ b/tests/pillar/openjdk-8.sls
@@ -1,7 +1,6 @@
java:
environment:
enabled: true
- version: '7'
+ version: '8'
platform: openjdk
development: true
-
diff --git a/tests/pillar/java_server.sls b/tests/pillar/oracle-jdk-7.sls
similarity index 74%
copy from tests/pillar/java_server.sls
copy to tests/pillar/oracle-jdk-7.sls
index 655ce6b..5d78917 100644
--- a/tests/pillar/java_server.sls
+++ b/tests/pillar/oracle-jdk-7.sls
@@ -2,6 +2,5 @@
environment:
enabled: true
version: '7'
- platform: openjdk
+ platform: oracle-java
development: true
-
diff --git a/tests/pillar/oracle-jdk-8.sls b/tests/pillar/oracle-jdk-8.sls
new file mode 100644
index 0000000..8e2cc8d
--- /dev/null
+++ b/tests/pillar/oracle-jdk-8.sls
@@ -0,0 +1,6 @@
+java:
+ environment:
+ enabled: true
+ version: '8'
+ platform: oracle-java
+ development: true