From 476bc0ec0bc8c8eabd2475aa059c01cac2eead9e Mon Sep 17 00:00:00 2001
From: Guido Grazioli <ggraziol@redhat.com>
Date: Tue, 20 May 2025 10:40:59 +0200
Subject: [PATCH] update test config

---
 .github/workflows/ci.yml                                   | 6 +++---
 molecule/default/molecule.yml                              | 4 +++-
 molecule/quarkus/molecule.yml                              | 4 +++-
 molecule/quarkus/prepare.yml                               | 2 +-
 molecule/{quarkus-devmode => quarkus_devmode}/converge.yml | 0
 molecule/{quarkus-devmode => quarkus_devmode}/molecule.yml | 4 +++-
 molecule/{quarkus-devmode => quarkus_devmode}/prepare.yml  | 0
 molecule/{quarkus-devmode => quarkus_devmode}/roles        | 0
 molecule/{quarkus-devmode => quarkus_devmode}/verify.yml   | 0
 molecule/quarkus_upgrade/molecule.yml                      | 6 +++++-
 10 files changed, 18 insertions(+), 8 deletions(-)
 rename molecule/{quarkus-devmode => quarkus_devmode}/converge.yml (100%)
 rename molecule/{quarkus-devmode => quarkus_devmode}/molecule.yml (93%)
 rename molecule/{quarkus-devmode => quarkus_devmode}/prepare.yml (100%)
 rename molecule/{quarkus-devmode => quarkus_devmode}/roles (100%)
 rename molecule/{quarkus-devmode => quarkus_devmode}/verify.yml (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16b6802..b9509a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,8 @@ jobs:
       fqcn: 'middleware_automation/keycloak'
       debug_verbosity: "${{ github.event.inputs.debug_verbosity }}"
       molecule_tests: >-
-        [ "default", "debian", "quarkus_ha", "quarkus_ha_remote" ]
+        [ "debian", "quarkus_ha", "quarkus_ha_remote" ]
       podman_tests_current: >-
-        [ "default", "quarkus", "quarkus-devmode", "quarkus_upgrade" ]
+        [ "default", "quarkus", "quarkus_devmode", "quarkus_upgrade" ]
       podman_tests_next: >-
-        [ "default", "quarkus", "quarkus-devmode", "quarkus_upgrade" ]
+        [ "default", "quarkus", "quarkus_devmode", "quarkus_upgrade" ]
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 011c08e..587a3c8 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 platforms:
   - name: instance
     image: registry.access.redhat.com/ubi9/ubi-init:latest
@@ -29,6 +29,8 @@ provisioner:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
     ANSIBLE_FORCE_COLOR: "true"
+    PROXY: "${PROXY}"
+    NO_PROXY: "${NO_PROXY}"
 verifier:
   name: ansible
 scenario:
diff --git a/molecule/quarkus/molecule.yml b/molecule/quarkus/molecule.yml
index cf975e5..1b4c8c5 100644
--- a/molecule/quarkus/molecule.yml
+++ b/molecule/quarkus/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 platforms:
   - name: instance
     image: registry.access.redhat.com/ubi9/ubi-init:latest
@@ -32,6 +32,8 @@ provisioner:
   env:
     ANSIBLE_FORCE_COLOR: "true"
     PYTHONHTTPSVERIFY: 0
+    PROXY: "${PROXY}"
+    NO_PROXY: "${NO_PROXY}"
 verifier:
   name: ansible
 scenario:
diff --git a/molecule/quarkus/prepare.yml b/molecule/quarkus/prepare.yml
index d8ef369..abe2518 100644
--- a/molecule/quarkus/prepare.yml
+++ b/molecule/quarkus/prepare.yml
@@ -24,7 +24,7 @@
     - name: Make sure a jre is available (for keytool to prepare keystore)
       delegate_to: localhost
       ansible.builtin.package:
-        name: "{{ 'java-21-openjdk-headless' if hera_home | length > 0 else 'openjdk-21-jdk-headless' }}"
+        name: java-21-openjdk-headless
         state: present
       become: true
       failed_when: false
diff --git a/molecule/quarkus-devmode/converge.yml b/molecule/quarkus_devmode/converge.yml
similarity index 100%
rename from molecule/quarkus-devmode/converge.yml
rename to molecule/quarkus_devmode/converge.yml
diff --git a/molecule/quarkus-devmode/molecule.yml b/molecule/quarkus_devmode/molecule.yml
similarity index 93%
rename from molecule/quarkus-devmode/molecule.yml
rename to molecule/quarkus_devmode/molecule.yml
index 2da7e01..0ae28b3 100644
--- a/molecule/quarkus-devmode/molecule.yml
+++ b/molecule/quarkus_devmode/molecule.yml
@@ -1,6 +1,6 @@
 ---
 driver:
-  name: docker
+  name: podman
 platforms:
   - name: instance
     image: registry.access.redhat.com/ubi9/ubi-init:latest
@@ -31,6 +31,8 @@ provisioner:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
     ANSIBLE_FORCE_COLOR: "true"
+    PROXY: "${PROXY}"
+    NO_PROXY: "${NO_PROXY}"
 verifier:
   name: ansible
 scenario:
diff --git a/molecule/quarkus-devmode/prepare.yml b/molecule/quarkus_devmode/prepare.yml
similarity index 100%
rename from molecule/quarkus-devmode/prepare.yml
rename to molecule/quarkus_devmode/prepare.yml
diff --git a/molecule/quarkus-devmode/roles b/molecule/quarkus_devmode/roles
similarity index 100%
rename from molecule/quarkus-devmode/roles
rename to molecule/quarkus_devmode/roles
diff --git a/molecule/quarkus-devmode/verify.yml b/molecule/quarkus_devmode/verify.yml
similarity index 100%
rename from molecule/quarkus-devmode/verify.yml
rename to molecule/quarkus_devmode/verify.yml
diff --git a/molecule/quarkus_upgrade/molecule.yml b/molecule/quarkus_upgrade/molecule.yml
index 21782e8..b121079 100644
--- a/molecule/quarkus_upgrade/molecule.yml
+++ b/molecule/quarkus_upgrade/molecule.yml
@@ -4,7 +4,7 @@ dependency:
   options:
     requirements-file: molecule/requirements.yml
 driver:
-  name: docker
+  name: podman
 platforms:
   - name: instance
     image: registry.access.redhat.com/ubi9/ubi-init:latest
@@ -27,6 +27,10 @@ provisioner:
     host_vars:
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
+  env:
+    ANSIBLE_FORCE_COLOR: "true"
+    PROXY: "${PROXY}"
+    NO_PROXY: "${NO_PROXY}"
 verifier:
   name: ansible
 scenario: