move java installer for ohs/IHS (#64)

* move java installer for ohs/IHS

* version increment

* debug failing actions

* t

* test deprecated module fix for include

* post test cleanup

* remove verbose from molecule matrix

* typos

---------

Co-authored-by: Roman Muntean <[email protected]>

galaxy.yml

@@ -11,7 +11,7 @@ name: spm_middleware
 
 # The version of the collection. Must be compatible with semantic versioning
 # Please note. version also exists in /github/workflows/release.yml and will need to be update also
-version: 1.4.0
+version: 1.4.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

roles/iim/tasks/centos.yml

@@ -17,4 +17,5 @@
   when: (ansible_distribution_major_version | int) == 7
 
 - name: Linux common
-  include: "linux_common.yml"
+  include_tasks:
+    file: "linux_common.yml"

roles/iim/tasks/debian.yml

@@ -6,4 +6,5 @@
     state: present
 
 - name: Linux common
-  include: "linux_common.yml"
+  include_tasks:
+    file: "linux_common.yml"

roles/iim/tasks/main.yml

@@ -15,5 +15,6 @@
   when: ansible_os_family == "Windows"
 
 - name: Install IIM
-  include: "{{ ansible_os_family | lower }}.yml"
+  include_tasks:
+    file: "{{ ansible_os_family | lower }}.yml"
   when: (linux_iim_dir.stat is defined and not linux_iim_dir.stat.exists) or (win_iim_dir.stat is defined and not win_iim_dir.stat.exists)

roles/iim/tasks/redhat.yml

@@ -16,4 +16,5 @@
   when: (ansible_distribution_major_version | int) == 7
 
 - name: Linux common
-  include: "linux_common.yml"
+  include_tasks:
+    file: "linux_common.yml"

roles/ohs/vars/v12.1.3.0.200412.yml

@@ -15,7 +15,7 @@ opatch_version: 13.9.4.2.6
 opatch_folder: 6880880
 
 # Full jdk is needed to update OPatch
-java_zip_path: 'Java/jdk-8u251-linux-x64.tar.gz'
+java_zip_path: 'WLS/jdk-8u251-linux-x64.tar.gz'
 java_version_path: 'jdk1.8.0_251'
 jdk_folder: "{{ ohs_home }}/oracle_common/jdk"
 

roles/ohs/vars/v12.2.1.4.210324.yml

@@ -17,7 +17,7 @@ opatch_version: 13.9.4.2.6
 opatch_folder: 6880880
 
 # Full jdk is needed to update OPatch
-java_zip_path: 'Java/jdk-8u251-linux-x64.tar.gz'
+java_zip_path: 'WLS/jdk-8u251-linux-x64.tar.gz'
 java_version_path: 'jdk1.8.0_251'
 jdk_folder: "{{ ohs_home }}/oracle_common/jdk"
 

roles/weblogic/defaults/main.yml

@@ -27,4 +27,4 @@ weblogic_installer_path: WLS
 # Local controller path relative to weblogic_installer_path OR relative path to download_url/weblogic_installer_path
 weblogic_patch_path: Patches
 # Local controller path OR relative path to download_url
-java_zip_path: 'Java'
+java_zip_path: 'WLS'