merative · martinfanning1 · Jul 9, 2024 · Jul 3, 2024 · Jul 8, 2024
diff --git a/galaxy.yml b/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.6.4
+version: 1.6.5
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

diff --git a/molecule/__ihs-v90/converge.yml b/molecule/__ihs-v90/converge.yml
@@ -6,7 +6,7 @@
  - merative.spm_middleware
 
  vars:
- ihs_version: 9.0.5.19
+ ihs_version: 9.0.5.20
  download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
  download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}
 

diff --git a/molecule/__websphere-v90/converge.yml b/molecule/__websphere-v90/converge.yml
@@ -6,9 +6,9 @@
  - merative.spm_middleware
 
  vars:
- iim_agent_version: 1.9.2008.20240227_0018
+ iim_agent_version: 1.9.2009.20240621_1105
  iim_install_path: /opt/IBM/InstallationManager
- websphere_version: 9.0.5.19
+ websphere_version: 9.0.5.20
  download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
  download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}
 

diff --git a/molecule/iim-191-rockylinux8/converge.yml b/molecule/iim-191-rockylinux8/converge.yml
@@ -9,6 +9,6 @@
  - iim
 
  vars:
- iim_agent_version: 1.9.2008.20240227_0018
+ iim_agent_version: 1.9.2009.20240621_1105
  download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers"
  download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"}
diff --git a/roles/ihs/README.md b/roles/ihs/README.md
@@ -13,18 +13,18 @@ NOTE: ihs_admin_pass should be changed after first installation.
 | `ihs_install_path` | `/opt/IBM/HTTPServer` |
 | `plg_install_path` | `/opt/IBM/WebSphere/Plugins` |
 | `wct_install_path` | `/opt/IBM/WebSphere/Toolbox` |
-| `ihs_version` | `9.0.5.19` |
+| `ihs_version` | `9.0.5.20` |
 | `ihs_config_type` | `local_distributed` |
 | `ihs_admin_user` | `wasadmin` |
 | `ihs_admin_pass` | `wasadmin` |
 | ----------------------- | --------------------------------------------------- |
-| Version-specific: | Values from `9.0.5.19` |
+| Version-specific: | Values from `9.0.5.20` |
 | ----------------------- | --------------------------------------------------- |
 | `ihs_installer_archive_list` | `was.repo.90500.[ihs|plugins|wct].zip` |
 | `ihs_fp_installer_path` | `WAS/9.0.5Fixpacks` |
-| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP019.zip` |
-| `ihs_pid` | `v90_9.0.5019.20240304_1205` |
-| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip` |
+| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP020.zip` |
+| `ihs_pid` | `v90~9.0.5020.20240605_1405` |
+| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-8.25-linux-x64-installmgr.zip` |
 | `ihs_java_pid` | `com.ibm.java.jdk.v8` |
 | ----------------------- | --------------------------------------------------- |
 | `iim_install_path` | `/opt/IBM/InstallationManager` |
@@ -53,7 +53,7 @@ merative.spm_middleware.iim
  - merative.spm_middleware.iim
  - merative.spm_middleware.ihs
  vars:
- - ihs_version: 9.0.5.19
+ - ihs_version: 9.0.5.20
  - download_url: "https://myserver.com/IHS/repos"
  - download_header: { 'Authorization': 'Basic EncodedString'}
 ```

diff --git a/roles/ihs/defaults/main.yml b/roles/ihs/defaults/main.yml
@@ -5,7 +5,7 @@ ihs_install_path: /opt/IBM/HTTPServer
 plg_install_path: /opt/IBM/WebSphere/Plugins
 wct_install_path: /opt/IBM/WebSphere/Toolbox
 
-ihs_version: 9.0.5.19
+ihs_version: 9.0.5.20
 
 ihs_config_type: local_distributed
 ihs_admin_user: wasadmin

diff --git a/roles/ihs/vars/v9.0.5.20.yml b/roles/ihs/vars/v9.0.5.20.yml
@@ -0,0 +1,16 @@
+---
+ihs_installer_path: WAS/9.0.5ND
+ihs_installer_archive_list:
+ - was.repo.90500.ihs.zip
+ - was.repo.90500.plugins.zip
+ - was.repo.90500.wct.zip
+
+ihs_fp_installer_path: WAS/9.0.5Fixpacks
+ihs_fp_installer_archive_list:
+ - 9.0.5-WS-IHSPLG-FP020.zip
+ - 9.0.5-WS-WCT-FP020.zip
+
+ihs_pid: v90_9.0.5020.20240605_1405
+
+ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.25-linux-x64-installmgr.zip
+ihs_java_pid: com.ibm.java.jdk.v8
diff --git a/roles/iim/README.md b/roles/iim/README.md
@@ -10,7 +10,7 @@ None
 
 | Property Name | Default value |
 | ------------------- | ----------------------------------------------------- |
-| `iim_agent_version` | `1.9.2008.20240227_0018` |
+| `iim_agent_version` | `1.9.2009.20240621_1105` |
 | `iim_install_path` | `/opt/IBM/InstallationManager` |
 | `download_url` | # Set this if license and installer is being downloaded from a http server|
 | `download_header` | # Use this in conjunction with `download_url` |

diff --git a/roles/iim/defaults/main.yml b/roles/iim/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-iim_agent_version: 1.9.2008.20240227_0018
+iim_agent_version: 1.9.2009.20240621_1105
 
 # Server info for downloading installers / repos directly, leave blank to copy
 download_url: # e.g. https://artifactory/repo

diff --git a/roles/websphere/README.md b/roles/websphere/README.md
@@ -11,7 +11,7 @@ IBM Installation Manager (1.9.x) must already be installed in the target environ
 | Property Name | Default value |
 | ------------------------ | --------------------------------------------------- |
 | `websphere_install_path` | `/opt/IBM/WebSphere/AppServer` |
-| `websphere_version` | `9.0.5.19` |
+| `websphere_version` | `9.0.5.20` |
 | ------------------------ | --------------------------------------------------- |
 | `iim_install_path` | `/opt/IBM/InstallationManager` |
 | `profiled_path` | `/opt/profile.d` |
@@ -35,7 +35,7 @@ merative.spm_middleware.iim
  - merative.spm_middleware
 
  vars:
- websphere_version: 9.0.5.19
+ websphere_version: 9.0.5.20
  download_url: "https://myserver.com/was/repos"
  download_header: { 'Authorization': 'Basic EncodedString'}
 

diff --git a/roles/websphere/defaults/main.yml b/roles/websphere/defaults/main.yml
@@ -3,7 +3,7 @@
 iim_install_path: /opt/IBM/InstallationManager
 # websphere
 websphere_install_path: /opt/IBM/WebSphere/AppServer
-websphere_version: 9.0.5.19
+websphere_version: 9.0.5.20
 security_username: websphere
 # use encrypted password
 security_password: dummypassword

diff --git a/roles/websphere/vars/v9.0.5.20.yml b/roles/websphere/vars/v9.0.5.20.yml
@@ -0,0 +1,17 @@
+---
+# FP Vars
+websphere_pid: v90_9.0.5020.20240605_1405
+websphere_fp_path: WAS/9.0.5Fixpacks
+websphere_fp_archive_list:
+ - 9.0.5-WS-WAS-FP020.zip
+
+# Base Vars
+websphere_base_pid: com.ibm.websphere.ND.v90
+websphere_base_path: WAS/9.0.5ND
+websphere_base_archive_list:
+ - was.repo.90500.nd.zip
+
+# Java Vars
+websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.25-linux-x64-installmgr.zip
+websphere_java_pid: com.ibm.java.jdk.v8
+websphere_java_home: java/8.0