From 8630a9d93c69d8b8e0539abf81220368973d4eab Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Wed, 22 Jan 2025 11:07:00 +0000 Subject: [PATCH 1/7] 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 --- galaxy.yml | 2 +- molecule/__ihs-v90/converge.yml | 2 +- molecule/__websphere-v90/converge.yml | 4 ++-- .../converge.yml | 2 +- .../molecule.yml | 0 roles/ihs/README.md | 14 +++++++------- roles/ihs/defaults/main.yml | 2 +- roles/ihs/vars/v9.0.5.22.yml | 16 ++++++++++++++++ roles/iim/README.md | 2 +- roles/iim/defaults/main.yml | 2 +- roles/websphere/README.md | 6 +++--- roles/websphere/defaults/main.yml | 2 +- roles/websphere/vars/v9.0.5.22.yml | 17 +++++++++++++++++ 13 files changed, 52 insertions(+), 19 deletions(-) rename molecule/{iim-191-rockylinux8 => iim-1101-rockylinux8}/converge.yml (86%) rename molecule/{iim-191-rockylinux8 => iim-1101-rockylinux8}/molecule.yml (100%) create mode 100644 roles/ihs/vars/v9.0.5.22.yml create mode 100644 roles/websphere/vars/v9.0.5.22.yml diff --git a/galaxy.yml b/galaxy.yml index 0786631f..ef226cd6 100644 --- 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 index 4cdea862..d14b6dcc 100644 --- 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 index b10604c7..daf611c9 100644 --- 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.3000.20240905_1526 + iim_agent_version: 1.10.1000.20241118_1329 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/molecule/iim-191-rockylinux8/converge.yml b/molecule/iim-1101-rockylinux8/converge.yml similarity index 86% rename from molecule/iim-191-rockylinux8/converge.yml rename to molecule/iim-1101-rockylinux8/converge.yml index 00b7d385..3116baef 100644 --- a/molecule/iim-191-rockylinux8/converge.yml +++ b/molecule/iim-1101-rockylinux8/converge.yml @@ -9,6 +9,6 @@ - iim vars: - iim_agent_version: 1.9.3000.20240905_1526 + iim_agent_version: 1.10.1000.20241118_1329 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/molecule.yml b/molecule/iim-1101-rockylinux8/molecule.yml similarity index 100% rename from molecule/iim-191-rockylinux8/molecule.yml rename to molecule/iim-1101-rockylinux8/molecule.yml diff --git a/roles/ihs/README.md b/roles/ihs/README.md index 43c3c7a8..0d0f35bb 100644 --- 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 index 9a34a949..47e395ed 100644 --- 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 new file mode 100644 index 00000000..1c140ac6 --- /dev/null +++ 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/iim/README.md b/roles/iim/README.md index f596114f..7bf3fa7b 100644 --- a/roles/iim/README.md +++ b/roles/iim/README.md @@ -10,7 +10,7 @@ None | Property Name | Default value | | ------------------- | ----------------------------------------------------- | -| `iim_agent_version` | `1.9.3000.20240905_1526` | +| `iim_agent_version` | `1.10.1000.20241118_1329` | | `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 index 7e336500..7ca4807a 100644 --- a/roles/iim/defaults/main.yml +++ b/roles/iim/defaults/main.yml @@ -1,5 +1,5 @@ --- -iim_agent_version: 1.9.3000.20240905_1526 +iim_agent_version: 1.10.1000.20241118_1329 # 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 index 89dd7ca7..210748ce 100644 --- 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 index 43cc5e72..8c3e67bf 100644 --- 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 new file mode 100644 index 00000000..a02e6bda --- /dev/null +++ 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 From cfa63fb9eaf01e05bdf80ca804847446b14df5b3 Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Wed, 22 Jan 2025 11:09:46 +0000 Subject: [PATCH 2/7] Update Github Workflow with new IIM name Update Github Workflow with new IIM name --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d414aa2e..7ba72f25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: - websphere-v90-rockylinux8 - db21158 - oracle19c-rockylinux8 - - iim-191-rockylinux8 + - iim-1101-rockylinux8 - ihs-v90-rockylinux8 - ohs-v12.2.1.4-rockylinux8 - liberty-rockylinux8 From 6c9bd9e900f4ca94af4d37fa7182ccf5087be1b0 Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Wed, 22 Jan 2025 12:14:10 +0000 Subject: [PATCH 3/7] 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.. --- .github/workflows/main.yml | 2 +- molecule/__websphere-v90/converge.yml | 2 +- .../{iim-1101-rockylinux8 => iim-191-rockylinux8}/converge.yml | 2 +- .../{iim-1101-rockylinux8 => iim-191-rockylinux8}/molecule.yml | 0 roles/iim/README.md | 2 +- roles/iim/defaults/main.yml | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename molecule/{iim-1101-rockylinux8 => iim-191-rockylinux8}/converge.yml (86%) rename molecule/{iim-1101-rockylinux8 => iim-191-rockylinux8}/molecule.yml (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ba72f25..d414aa2e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: - websphere-v90-rockylinux8 - db21158 - oracle19c-rockylinux8 - - iim-1101-rockylinux8 + - iim-191-rockylinux8 - ihs-v90-rockylinux8 - ohs-v12.2.1.4-rockylinux8 - liberty-rockylinux8 diff --git a/molecule/__websphere-v90/converge.yml b/molecule/__websphere-v90/converge.yml index daf611c9..f6cff936 100644 --- a/molecule/__websphere-v90/converge.yml +++ b/molecule/__websphere-v90/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - iim_agent_version: 1.10.1000.20241118_1329 + iim_agent_version: 1.9.3000.20240905_1526 iim_install_path: /opt/IBM/InstallationManager websphere_version: 9.0.5.22 download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers" diff --git a/molecule/iim-1101-rockylinux8/converge.yml b/molecule/iim-191-rockylinux8/converge.yml similarity index 86% rename from molecule/iim-1101-rockylinux8/converge.yml rename to molecule/iim-191-rockylinux8/converge.yml index 3116baef..00b7d385 100644 --- a/molecule/iim-1101-rockylinux8/converge.yml +++ b/molecule/iim-191-rockylinux8/converge.yml @@ -9,6 +9,6 @@ - iim vars: - iim_agent_version: 1.10.1000.20241118_1329 + iim_agent_version: 1.9.3000.20240905_1526 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-1101-rockylinux8/molecule.yml b/molecule/iim-191-rockylinux8/molecule.yml similarity index 100% rename from molecule/iim-1101-rockylinux8/molecule.yml rename to molecule/iim-191-rockylinux8/molecule.yml diff --git a/roles/iim/README.md b/roles/iim/README.md index 7bf3fa7b..f596114f 100644 --- a/roles/iim/README.md +++ b/roles/iim/README.md @@ -10,7 +10,7 @@ None | Property Name | Default value | | ------------------- | ----------------------------------------------------- | -| `iim_agent_version` | `1.10.1000.20241118_1329` | +| `iim_agent_version` | `1.9.3000.20240905_1526` | | `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 index 7ca4807a..7e336500 100644 --- a/roles/iim/defaults/main.yml +++ b/roles/iim/defaults/main.yml @@ -1,5 +1,5 @@ --- -iim_agent_version: 1.10.1000.20241118_1329 +iim_agent_version: 1.9.3000.20240905_1526 # Server info for downloading installers / repos directly, leave blank to copy download_url: # e.g. https://artifactory/repo From 2db54dd37abe115e58d35e43d88be4727f874c4a Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Wed, 22 Jan 2025 17:47:38 +0000 Subject: [PATCH 4/7] Update the Java to the latest for WLP 24.0.0.12 Update the Java to the latest available for WLP 24.0.0.12 files --- roles/liberty/vars/v24.0.0.12-JDK17.yml | 4 ++-- roles/liberty/vars/v24.0.0.12-JDK21.yml | 2 +- roles/liberty/vars/v24.0.0.12.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/liberty/vars/v24.0.0.12-JDK17.yml b/roles/liberty/vars/v24.0.0.12-JDK17.yml index d463184b..2abaaacc 100644 --- a/roles/liberty/vars/v24.0.0.12-JDK17.yml +++ b/roles/liberty/vars/v24.0.0.12-JDK17.yml @@ -4,5 +4,5 @@ liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip liberty_pid: 24.0.12.20241119_0657 jdk_version: 17.0 -liberty_java_zip_path: Java/IBM/ibm-semeru-certified-jdk_x64_linux_17.0.12.1-installmgr.zip -liberty_java_pid: com.ibm.java.jdk.v17_17.0.12001.20240913_0245 +liberty_java_zip_path: Java/IBM/ibm-semeru-certified-jdk_x64_linux_17.0.13.0-installmgr.zip +liberty_java_pid: com.ibm.java.jdk.v17_17.0.13000.20241111_2146 diff --git a/roles/liberty/vars/v24.0.0.12-JDK21.yml b/roles/liberty/vars/v24.0.0.12-JDK21.yml index cb1ec9af..97d492d6 100644 --- a/roles/liberty/vars/v24.0.0.12-JDK21.yml +++ b/roles/liberty/vars/v24.0.0.12-JDK21.yml @@ -4,4 +4,4 @@ liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip liberty_pid: 24.0.12.20241119_0657 jdk_version: 21.0 jdk_installation_way: unzip -liberty_java_zip_path: Java/IBM/ibm-semeru-open-jdk_x64_linux_21.0.4_7_openj9-0.46.1.tar.gz +liberty_java_zip_path: Java/IBM/ibm-semeru-open-jdk_x64_linux_21.0.5_11_openj9-0.48.0.tar.gz diff --git a/roles/liberty/vars/v24.0.0.12.yml b/roles/liberty/vars/v24.0.0.12.yml index 13b236aa..3deb0c67 100644 --- a/roles/liberty/vars/v24.0.0.12.yml +++ b/roles/liberty/vars/v24.0.0.12.yml @@ -3,5 +3,5 @@ liberty_fp_path: WLP/24.0.0.12-WS-LIBERTY-ND-FP.zip liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip liberty_pid: 24.0.12.20241119_0657 -liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.30-linux-x64-installmgr.zip -liberty_java_pid: com.ibm.java.jdk.v8_8.0.8030.20240801_0349 +liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.35-linux-x64-installmgr.zip +liberty_java_pid: com.ibm.java.jdk.v8_8.0.8035.20241125_0150 From 8b1b067eb7f6663efb3e6a32d6be6a96e3584781 Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Wed, 22 Jan 2025 17:48:06 +0000 Subject: [PATCH 5/7] Update Galaxy File Update Galaxy File --- galaxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index ef226cd6..59d221e8 100644 --- 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.8.0 +version: 1.8.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md From 026c79a5eb74fe690fee96e041a4c3aa5468575b Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Thu, 23 Jan 2025 10:13:42 +0000 Subject: [PATCH 6/7] Test DB2 List Command Test DB2 List Command --- roles/db2/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/db2/tasks/main.yml b/roles/db2/tasks/main.yml index 40eb98b5..d2b24f9c 100644 --- a/roles/db2/tasks/main.yml +++ b/roles/db2/tasks/main.yml @@ -33,7 +33,7 @@ - "'Trial' in license_info.stdout" - name: List database directory - command: db2 list database directory + command: . ~/.bash_profile && db2 list database directory changed_when: false become: yes become_user: "{{ db2_db_username }}" From bd99dc835a232a5bce9f2bee1312905c6d9a9c1a Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Thu, 23 Jan 2025 10:35:15 +0000 Subject: [PATCH 7/7] Revert List Database Dir command test Revert List Database Dir command test --- roles/db2/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/db2/tasks/main.yml b/roles/db2/tasks/main.yml index d2b24f9c..40eb98b5 100644 --- a/roles/db2/tasks/main.yml +++ b/roles/db2/tasks/main.yml @@ -33,7 +33,7 @@ - "'Trial' in license_info.stdout" - name: List database directory - command: . ~/.bash_profile && db2 list database directory + command: db2 list database directory changed_when: false become: yes become_user: "{{ db2_db_username }}"