Debian bookworm is differnt.

robertdebock · May 12, 2023 · 968d5e2 · 968d5e2
1 parent d220b6a
commit 968d5e2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,8 @@ This example is taken from [`molecule/default/converge.yml`](https://github.com/
     _desired_java_version:
       default: 8
       Debian: 11
-    desired_java_version: "{{ _desired_java_version[ansible_distribution] | default(_desired_java_version['default']) }}"
+      Debian-bookworm: 17
+    desired_java_version: "{{ _desired_java_version[ansible_distribution ~ '-' ~ ansible_distribution_release] | default(_desired_java_version[ansible_distribution] | default(_desired_java_version['default'])) }}"
 
   roles:
     - role: robertdebock.java
@@ -33,10 +34,10 @@ The machine needs to be prepared. In CI this is done using [`molecule/default/pr
 
 ```yaml
 ---
-- name: Default
+- name: Prepare
   hosts: all
-  gather_facts: no
   become: yes
+  gather_facts: no
 
   roles:
     - role: robertdebock.bootstrap

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -9,7 +9,8 @@
     _desired_java_version:
       default: 8
       Debian: 11
-    desired_java_version: "{{ _desired_java_version[ansible_distribution] | default(_desired_java_version['default']) }}"
+      Debian-bookworm: 17
+    desired_java_version: "{{ _desired_java_version[ansible_distribution ~ '-' ~ ansible_distribution_release] | default(_desired_java_version[ansible_distribution] | default(_desired_java_version['default'])) }}"
 
   roles:
     - role: ansible-role-java

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -1,8 +1,8 @@
 ---
-- name: Default
+- name: Prepare
   hosts: all
-  gather_facts: no
   become: yes
+  gather_facts: no
 
   roles:
     - role: robertdebock.bootstrap
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -8,7 +8,8 @@
     _expected_java_version:
       default: 'openjdk version "1.8.'
       Debian: 'openjdk version "11.0.'
-    expected_java_version: "{{ _expected_java_version[ansible_distribution] | default(_expected_java_version['default']) }}"
+      Debian-bookworm: 'openjdk version "17.0.'
+    expected_java_version: "{{ _expected_java_version[ansible_distribution ~ '-' ~ ansible_distribution_release] | default(_expected_java_version[ansible_distribution] | default(_expected_java_version['default'])) }}"
 
   tasks:
     - name: Run java -version