Revert "AMW-431 Ensure wildfly collection is compatible with RHEL 10"

RanabirChakraborty · RanabirChakraborty · commit 31e4d4d9175f · 2025-10-15T19:17:31.000+05:30
diff --git a/molecule/colocated_cluster/molecule.yml b/molecule/colocated_cluster/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
@@ -31,7 +31,7 @@ provisioner:
       group_vars: ../group_vars
     host_vars:
       instance:
-        wildfly_java_package_name: java-21-openjdk-headless
+        wildfly_java_package_name: java-17-openjdk-headless
         molecule_scenario_requires_app: true
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
diff --git a/molecule/custom_config_file/molecule.yml b/molecule/custom_config_file/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
@@ -31,7 +31,7 @@ provisioner:
       group_vars: ../group_vars
     host_vars:
       instance:
-        wildfly_java_package_name: java-21-openjdk-headless
+        wildfly_java_package_name: java-17-openjdk-headless
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
diff --git a/molecule/install_options/converge.yml b/molecule/install_options/converge.yml
@@ -4,4 +4,4 @@
     wildfly_install_workdir: /apps/
     wildfly_user: mware
     wildfly_group: sysgroup
-    wildfly_java_package_name: java-21-openjdk-headless
+    wildfly_java_package_name: java-17-openjdk-headless
diff --git a/molecule/install_options/molecule.yml b/molecule/install_options/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
diff --git a/molecule/install_options/verify.yml b/molecule/install_options/verify.yml
@@ -4,13 +4,13 @@
     wildfly_install_workdir: /apps/
     wildfly_user: mware
     wildfly_group: sysgroup
-    wildfly_java_package_name: java-21-openjdk-headless
+    wildfly_java_package_name: java-17-openjdk-headless
     wildfly_validation_skip_jdbc_drivers_check: false
 
 - name: Validation
   hosts: all
   tasks:
     - name: Verify we are running on requested jvm
       ansible.builtin.shell: |
-        ps -ef | grep /etc/alternatives/jre_21/bin/java | grep -v grep
+        ps -ef | grep /etc/alternatives/jre_17/bin/java | grep -v grep
       changed_when: False
diff --git a/molecule/prepare.yml b/molecule/prepare.yml
@@ -39,7 +39,7 @@
       become: "{{ wildfly_install_requires_become | default(true) }}"
       ansible.builtin.yum:
         name:
-          - java-21-openjdk-headless
+          - java-17-openjdk
           - procps-ng
           - tzdata-java
         state: present
diff --git a/molecule/prospero/molecule.yml b/molecule/prospero/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
@@ -29,7 +29,7 @@ provisioner:
       group_vars: ../group_vars
     host_vars:
       instance:
-        wildfly_java_package_name: java-21-openjdk-headless
+        wildfly_java_package_name: java-17-openjdk-headless
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
@@ -31,7 +31,7 @@ provisioner:
       group_vars: ../group_vars
     host_vars:
       instance:
-        wildfly_java_package_name: java-21-openjdk-headless
+        wildfly_java_package_name: java-17-openjdk-headless
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
diff --git a/molecule/yaml_config_validation/molecule.yml b/molecule/yaml_config_validation/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: ${CI_DRIVER:-docker}
 platforms:
   - name: instance
-    image: registry.access.redhat.com/ubi10/ubi-init:latest
+    image: registry.access.redhat.com/ubi9/ubi-init:latest
     pre_build_image: true
     privileged: true
     command: "/usr/sbin/init"
@@ -29,7 +29,7 @@ provisioner:
       group_vars: ../group_vars
     host_vars:
       instance:
-        wildfly_java_package_name: java-21-openjdk-headless
+        wildfly_java_package_name: java-17-openjdk-headless
       localhost:
         ansible_python_interpreter: "{{ ansible_playbook_python }}"
   env:
diff --git a/roles/wildfly_install/README.md b/roles/wildfly_install/README.md
@@ -26,7 +26,7 @@ Role Defaults
 |`wildfly_config_custom_file`| Custom standalone.xml config to be copied to target instance and used as base | `''` |
 |`wildfly_user`| posix user account for wildfly | `wildfly` |
 |`wildfly_group`| posix group for wildfly | `{{ wildfly_user }}` |
-|`wildfly_java_package_name`| RHEL java rpm package | `java-21-openjdk-headless` |
+|`wildfly_java_package_name`| RHEL java rpm package | `java-11-openjdk-headless` |
 |`wildfly_offline_install`| Whether to install from local archive | `False` |
 
 
diff --git a/roles/wildfly_install/defaults/main.yml b/roles/wildfly_install/defaults/main.yml
@@ -12,7 +12,7 @@ wildfly_config_base: 'standalone.xml'
 wildfly_config_custom_file: ''
 wildfly_user: 'wildfly'
 wildfly_group: "{{ wildfly_user }}"
-wildfly_java_version: 21
+wildfly_java_version: 17
 wildfly_java_package_name: "java-{{ wildfly_java_version }}-openjdk-headless"
 wildfly_install_force_reinstall_config_base: false
 
diff --git a/roles/wildfly_install/meta/argument_specs.yml b/roles/wildfly_install/meta/argument_specs.yml
@@ -46,7 +46,7 @@ argument_specs:
                 description: "posix group for wildfly"
                 type: "str"
             wildfly_java_package_name:
-                default: "java-21-openjdk-headless"
+                default: "java-11-openjdk-headless"
                 description: "RHEL java rpm package"
                 type: "str"
             wildfly_offline_install:
@@ -144,8 +144,8 @@ argument_specs:
                 description: "Supported OpenJDK and RHEL version for EAP"
                 default:
                   eap7:
-                    openjdk: ['1.8', '11', '17', '21']
-                    rhel: ['7', '8', '9', '10']
+                    openjdk: ['1.8', '11', '17']
+                    rhel: ['7', '8', '9']
                   eap8:
-                    openjdk: ['11', '17', '21']
-                    rhel: ['8', '9', '10']
+                    openjdk: ['11', '17']
+                    rhel: ['8', '9']
diff --git a/roles/wildfly_migration/defaults/main.yml b/roles/wildfly_migration/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 wildfly_migration_java_home: '/usr/lib/jvm/jre'
-wildfly_migration_jdk_package_name: 'java-21-openjdk-devel'
+wildfly_migration_jdk_package_name: 'java-17-openjdk-devel'
 wildfly_migration_jdk_package_skip_install: False
 wildfly_migration_server_tool_home: "{{ target_wildfly_home }}"
 wildfly_migration_tool_bin_folder: 'bin'
diff --git a/roles/wildfly_migration/meta/argument_specs.yml b/roles/wildfly_migration/meta/argument_specs.yml
@@ -62,7 +62,7 @@ argument_specs:
                 description: "Path to the JAVA HOME to be used by the server migration tool"
                 type: "str"
             wildfly_migration_jdk_package_name:
-                default: "java-21-openjdk-devel"
+                default: "java-17-openjdk-devel"
                 description: "Name of the RPM package to install for the JVM used by the server migration tool"
                 type: "str"
             wildfly_migration_jdk_package_skip_install:
diff --git a/roles/wildfly_systemd/README.md b/roles/wildfly_systemd/README.md
@@ -34,7 +34,7 @@ Role Defaults
 |`wildfly_service_config_file_location`| Path for wildfly systemd unit file | `/etc/sysconfig` |
 |`wildfly_enable_yml_config`| Enable yaml file configuration feature (WFCORE5343) | `False` |
 |`wildfly_yml_configs`| List of filenames for wildfly configuration bootstrap | `[]` |
-|`wildfly_java_package_name`| RHEL 10 java rpm package | `java-21-openjdk-headless` |
+|`wildfly_java_package_name`| RHEL java rpm package | `java-11-openjdk-headless` |
 |`wildfly_java_opts`| Additional settings for the JVM running wildfly | `-Xmx1024M -Xms512M` |
 |`wildfly_bind_addr`| Bind address for listening to public network | `0.0.0.0` |
 |`wildfly_bind_addr_private`| Bind address for listening to private network |`127.0.0.1` |
diff --git a/roles/wildfly_systemd/defaults/main.yml b/roles/wildfly_systemd/defaults/main.yml
@@ -8,7 +8,7 @@ wildfly_config_base: 'standalone.xml'
 wildfly_config_custom_file: ''
 wildfly_port_range_offset: 0
 
-wildfly_java_package_name: java-21-openjdk-headless
+wildfly_java_package_name: java-17-openjdk-headless
 wildfly_java_opts: '-Xmx1024M -Xms512M'
 
 wildfly_systemd_unit_enabled: true
diff --git a/roles/wildfly_systemd/meta/argument_specs.yml b/roles/wildfly_systemd/meta/argument_specs.yml
@@ -42,7 +42,7 @@ argument_specs:
                 description: "Increment for `jboss.socket.binding.port-offset`"
                 type: "int"
             wildfly_java_package_name:
-                default: "java-21-openjdk-headless"
+                default: "java-11-openjdk-headless"
                 description: "RHEL java rpm package"
                 type: "str"
             wildfly_systemd_java_home:
