Add openjdk 12 for opensuse, simplify playbooks for testing.

robertdebock · Nov 23, 2018 · 73cf256 · 73cf256
1 parent 95e4035
commit 73cf256
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 425 deletions.
diff --git a/README.md b/README.md
@@ -12,146 +12,9 @@ This example is taken from `molecule/default/playbook.yml`:
 ```
 ---
 - name: Default
-  hosts: "*-default"
-  gather_facts: false
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 6 JRE
-  hosts: "*-openjdk-6-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 6
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 7 JRE
-  hosts: "*-openjdk-7-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 7
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 8 JRE
-  hosts: "*-openjdk-8-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 8
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 9 JRE
-  hosts: "*-openjdk-9-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 9
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 10 JRE
-  hosts: "*-openjdk-10-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 10
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 11 JRE
-  hosts: "*-openjdk-11-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 11
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 6 JDK
-  hosts: "*-openjdk-6-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 6
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 7 JDK
-  hosts: "*-openjdk-7-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 7
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 8 JDK
-  hosts: "*-openjdk-8-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 8
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 9 JDK
-  hosts: "*-openjdk-9-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 9
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 10 JDK
-  hosts: "*-openjdk-10-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 10
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - robertdebock.java
-
-- name: OpenJDK 11 JDK
-  hosts: "*-openjdk-11-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 11
-    java_type: jdk
+  hosts: all
+  gather_facts: no
+  become: yes
 
   roles:
     - robertdebock.bootstrap

diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
@@ -1,145 +1,8 @@
 ---
 - name: Default
-  hosts: "*-default"
-  gather_facts: false
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 6 JRE
-  hosts: "*-openjdk-6-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 6
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 7 JRE
-  hosts: "*-openjdk-7-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 7
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 8 JRE
-  hosts: "*-openjdk-8-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 8
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 9 JRE
-  hosts: "*-openjdk-9-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 9
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 10 JRE
-  hosts: "*-openjdk-10-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 10
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 11 JRE
-  hosts: "*-openjdk-11-jre"
-  gather_facts: false
-
-  vars:
-    java_version: 11
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 6 JDK
-  hosts: "*-openjdk-6-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 6
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 7 JDK
-  hosts: "*-openjdk-7-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 7
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 8 JDK
-  hosts: "*-openjdk-8-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 8
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 9 JDK
-  hosts: "*-openjdk-9-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 9
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 10 JDK
-  hosts: "*-openjdk-10-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 10
-    java_type: jdk
-
-  roles:
-    - robertdebock.bootstrap
-    - ansible-role-java
-
-- name: OpenJDK 11 JDK
-  hosts: "*-openjdk-11-jdk"
-  gather_facts: false
-
-  vars:
-    java_version: 11
-    java_type: jdk
+  hosts: all
+  gather_facts: no
+  become: yes
 
   roles:
     - robertdebock.bootstrap