commit 1dbadf58cf32c5160692c136186dd936e85eb45e
author Martin Polreich <polreichmartin@gmail.com> Wed May 17 15:01:11 2017 +0200
committer Martin Polreich <polreichmartin@gmail.com> Wed May 17 15:01:11 2017 +0200
tree 5757176bb9ff3d61d4522cd65bac1852080db86c
parent f457c24633a3afd3991e2456be9ff417cc15b585

Update test pillars, Added Kitchen tests and Travis

tests/pillar/openjdk-7.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
-

tests/pillar/openjdk-8.sls

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
-

tests/pillar/oracle-jdk-7.sls

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
-

tests/pillar/oracle-jdk-8.sls

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