From a13b7b719bba2101492edf15b7f5c1de5b11110f Mon Sep 17 00:00:00 2001
From: Guido Grazioli <ggraziol@redhat.com>
Date: Tue, 10 Oct 2023 10:44:10 +0200
Subject: [PATCH] fixup molecule tests

---
 molecule/preinstalledjdk/converge.yml |  6 +++---
 molecule/uninstall/verify.yml         | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/molecule/preinstalledjdk/converge.yml b/molecule/preinstalledjdk/converge.yml
index 5ad718bf..e1f2d736 100644
--- a/molecule/preinstalledjdk/converge.yml
+++ b/molecule/preinstalledjdk/converge.yml
@@ -7,6 +7,6 @@
     - middleware_automation.jws
   roles:
     - role: jws
-      vars:
-        jws_systemd_enabled: True
-        jws_java_home: "{{ jdk_home }}"
+      jws_systemd_enabled: True
+      jws_java_home: "{{ jdk_home }}"
+      jws_service_systemd_type: forking
diff --git a/molecule/uninstall/verify.yml b/molecule/uninstall/verify.yml
index 33f9d8fe..1e132d69 100644
--- a/molecule/uninstall/verify.yml
+++ b/molecule/uninstall/verify.yml
@@ -1,19 +1,17 @@
 ---
 - name: Verify
   hosts: all
-  vars:
-    tomcat_version: 9.0.65
-    jws_home: "/opt/apache-tomcat-{{ tomcat_version }}"
-  collections:
-    - middleware_automation.jws
   tasks:
+    - name: Include jws role defaults
+      ansible.builtin.include_vars:
+        file: roles/jws/defaults/main.yml
     - name: "Read info on server home: {{ jws_home }}"
-      stat:
+      ansible.builtin.stat:
         path: "{{ jws_home }}/lib"
       register: tc_home
 
     - name: "Check that server home has been removed"
-      assert:
+      ansible.builtin.assert:
         that:
           - tc_home is defined
           - tc_home.stat is defined