Update IIM version, WAS & IHS to 9.0.5.22 (#111)

* Update IIM version, WAS & IHS to 9.0.5.212 Update to latest IBM Installation Manager - 1.10.1 (renamed molecule test) Update WebSphere and IBM HTTP Server to v9.0.5.22 - new yaml files Update READMEs Update Molecule Tests Update Galaxy file * Update Github Workflow with new IIM name Update Github Workflow with new IIM name * Revert Back introduction of IIM 1.10.1 due to errors Reverting back to IIM 1.9.3.. When using IIM 1.10.1 there were failures installing WebSphere Liberty... Further investigation needed.. Will attach errors.. --------- Co-authored-by: Martin Fanning <[email protected]>
merative · Jan 23, 2025 · 69235af · 69235af
1 parent 666c00f
commit 69235af
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 15 deletions.
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.7.9
+version: 1.8.0
 
 # 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.21
+    ihs_version: 9.0.5.22
     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
@@ -8,7 +8,7 @@
   vars:
     iim_agent_version: 1.9.3000.20240905_1526
     iim_install_path: /opt/IBM/InstallationManager
-    websphere_version: 9.0.5.21
+    websphere_version: 9.0.5.22
     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
@@ -4,7 +4,7 @@ The `ihs` role will install IBM HTTP Server.
 
 ## Requirements
 
-IBM Installation Manager (1.9.x) must already be installed in the target environment.
+IBM Installation Manager (1.9.x) or higher must already be installed in the target environment.
 
 ## Role Variables
 NOTE: ihs_admin_pass should be changed after first installation.
@@ -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.21`                                           |
+| `ihs_version`           | `9.0.5.22`                                           |
 | `ihs_config_type`       | `local_distributed`                                 |
 | `ihs_admin_user`        | `wasadmin`                                          |
 | `ihs_admin_pass`        | `wasadmin`                                          |
 | ----------------------- | --------------------------------------------------- |
-| Version-specific:       | Values from `9.0.5.21`                               |
+| Version-specific:       | Values from `9.0.5.22`                               |
 | ----------------------- | --------------------------------------------------- |x  
 | `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]-FP021.zip`           |
-| `ihs_pid`               | `v90~9.0.5021.20240823_1839`                        |
-| `ihs_java_zip_path`     | `Java/IBM/ibm-java-sdk-8.0-8.30-linux-x64-installmgr.zip` |
+| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP022.zip`           |
+| `ihs_pid`               | `v90~9.0.5022.20241118_0055`                        |
+| `ihs_java_zip_path`     | `Java/IBM/ibm-java-sdk-8.0-8.35-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.21
+        - ihs_version: 9.0.5.22
         - 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.21
+ihs_version: 9.0.5.22
 
 ihs_config_type: local_distributed
 ihs_admin_user: wasadmin

diff --git a/roles/ihs/vars/v9.0.5.22.yml b/roles/ihs/vars/v9.0.5.22.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-FP022.zip
+  - 9.0.5-WS-WCT-FP022.zip
+
+ihs_pid: v90_9.0.5022.20241118_0055
+
+ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.35-linux-x64-installmgr.zip
+ihs_java_pid: com.ibm.java.jdk.v8
diff --git a/roles/websphere/README.md b/roles/websphere/README.md
@@ -4,14 +4,14 @@ The `websphere` role will install IBM WebSphere Application Server (ND).
 
 ## Requirements
 
-IBM Installation Manager (1.9.x) must already be installed in the target environment.
+IBM Installation Manager (1.9.x) or higher must already be installed in the target environment.
 
 ## Role Variables
 
 | Property Name            | Default value                                       |
 | ------------------------ | --------------------------------------------------- |
 | `websphere_install_path` | `/opt/IBM/WebSphere/AppServer`                      |
-| `websphere_version`      | `9.0.5.21`                                           |
+| `websphere_version`      | `9.0.5.22`                                           |
 | ------------------------ | --------------------------------------------------- |
 | `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.21
+    websphere_version: 9.0.5.22
     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.21
+websphere_version: 9.0.5.22
 security_username: websphere
 # use encrypted password
 security_password: dummypassword

diff --git a/roles/websphere/vars/v9.0.5.22.yml b/roles/websphere/vars/v9.0.5.22.yml
@@ -0,0 +1,17 @@
+---
+# FP Vars
+websphere_pid: v90_9.0.5022.20241118_0055
+websphere_fp_path: WAS/9.0.5Fixpacks
+websphere_fp_archive_list:
+  - 9.0.5-WS-WAS-FP022.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.35-linux-x64-installmgr.zip
+websphere_java_pid: com.ibm.java.jdk.v8
+websphere_java_home: java/8.0