From 84d649bab85aadfac10468789ff4864a7b546c5a Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Wed, 25 Sep 2024 17:15:56 +0100 Subject: [PATCH 1/2] Update WebSphere Liberty (java 17 & 21) to v24.0.0.9 Update WebSphere Liberty (java 17 & java 21) to v24.0.0.9 - new yaml file Update Molecule tests Update galaxy file --- galaxy.yml | 2 +- molecule/__liberty17/converge.yml | 2 +- molecule/__liberty21/converge.yml | 2 +- roles/liberty/vars/v24.0.0.9-JDK17.yml | 8 ++++++++ roles/liberty/vars/v24.0.0.9-JDK21.yml | 7 +++++++ 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 roles/liberty/vars/v24.0.0.9-JDK17.yml create mode 100644 roles/liberty/vars/v24.0.0.9-JDK21.yml diff --git a/galaxy.yml b/galaxy.yml index 2d39915..4ea86a6 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.0 +version: 1.7.1 # 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/__liberty17/converge.yml b/molecule/__liberty17/converge.yml index 8dcb928..cc220b8 100644 --- a/molecule/__liberty17/converge.yml +++ b/molecule/__liberty17/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - liberty_version: "24.0.0.3-JDK17" + liberty_version: "24.0.0.9-JDK17" 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/__liberty21/converge.yml b/molecule/__liberty21/converge.yml index c92d1c5..3b9fc2a 100644 --- a/molecule/__liberty21/converge.yml +++ b/molecule/__liberty21/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - liberty_version: "24.0.0.3-JDK21" + liberty_version: "24.0.0.9-JDK21" 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/liberty/vars/v24.0.0.9-JDK17.yml b/roles/liberty/vars/v24.0.0.9-JDK17.yml new file mode 100644 index 0000000..6aa8859 --- /dev/null +++ b/roles/liberty/vars/v24.0.0.9-JDK17.yml @@ -0,0 +1,8 @@ +--- +liberty_fp_path: WLP/24.0.0.9-WS-LIBERTY-ND-FP.zip +liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip +liberty_pid: 24.0.9.20240827_1743 +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 diff --git a/roles/liberty/vars/v24.0.0.9-JDK21.yml b/roles/liberty/vars/v24.0.0.9-JDK21.yml new file mode 100644 index 0000000..ff8552f --- /dev/null +++ b/roles/liberty/vars/v24.0.0.9-JDK21.yml @@ -0,0 +1,7 @@ +--- +liberty_fp_path: WLP/24.0.0.9-WS-LIBERTY-ND-FP.zip +liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip +liberty_pid: 24.0.9.20240827_1743 +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 From 58b0d18f625ac83d5f5ac6e89cef3ed4b008eac2 Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Thu, 26 Sep 2024 09:32:29 +0100 Subject: [PATCH 2/2] Update IIM version, WAS & IHS to 9.0.5.21 Update to latest IBM Installation Manager Update WebSphere and IBM HTTP Server to v9.0.5.21 - 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 ++-- molecule/iim-191-rockylinux8/converge.yml | 2 +- roles/ihs/README.md | 14 +++++++------- roles/ihs/defaults/main.yml | 2 +- roles/ihs/vars/v9.0.5.21.yml | 16 ++++++++++++++++ roles/iim/README.md | 2 +- roles/iim/defaults/main.yml | 2 +- roles/websphere/README.md | 4 ++-- roles/websphere/defaults/main.yml | 2 +- roles/websphere/vars/v9.0.5.21.yml | 17 +++++++++++++++++ 12 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 roles/ihs/vars/v9.0.5.21.yml create mode 100644 roles/websphere/vars/v9.0.5.21.yml diff --git a/galaxy.yml b/galaxy.yml index 4ea86a6..f5d1e9e 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.1 +version: 1.7.2 # 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 4622106..4cdea86 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.20 + ihs_version: 9.0.5.21 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 39104ea..b10604c 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.2009.20240621_1105 + iim_agent_version: 1.9.3000.20240905_1526 iim_install_path: /opt/IBM/InstallationManager - websphere_version: 9.0.5.20 + websphere_version: 9.0.5.21 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 index 028afa1..00b7d38 100644 --- 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.2009.20240621_1105 + 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/roles/ihs/README.md b/roles/ihs/README.md index ae63b0f..43c3c7a 100644 --- 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.20` | +| `ihs_version` | `9.0.5.21` | | `ihs_config_type` | `local_distributed` | | `ihs_admin_user` | `wasadmin` | | `ihs_admin_pass` | `wasadmin` | | ----------------------- | --------------------------------------------------- | -| Version-specific: | Values from `9.0.5.20` | -| ----------------------- | --------------------------------------------------- | +| Version-specific: | Values from `9.0.5.21` | +| ----------------------- | --------------------------------------------------- |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]-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_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_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.20 + - ihs_version: 9.0.5.21 - 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 2694613..9a34a94 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.20 +ihs_version: 9.0.5.21 ihs_config_type: local_distributed ihs_admin_user: wasadmin diff --git a/roles/ihs/vars/v9.0.5.21.yml b/roles/ihs/vars/v9.0.5.21.yml new file mode 100644 index 0000000..738a139 --- /dev/null +++ b/roles/ihs/vars/v9.0.5.21.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-FP021.zip + - 9.0.5-WS-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_java_pid: com.ibm.java.jdk.v8 diff --git a/roles/iim/README.md b/roles/iim/README.md index d9b4217..f596114 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.2009.20240621_1105` | +| `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 c870af6..7e33650 100644 --- a/roles/iim/defaults/main.yml +++ b/roles/iim/defaults/main.yml @@ -1,5 +1,5 @@ --- -iim_agent_version: 1.9.2009.20240621_1105 +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 diff --git a/roles/websphere/README.md b/roles/websphere/README.md index 84e03c8..89dd7ca 100644 --- 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.20` | +| `websphere_version` | `9.0.5.21` | | ------------------------ | --------------------------------------------------- | | `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.20 + websphere_version: 9.0.5.21 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 0c08d92..43cc5e7 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.20 +websphere_version: 9.0.5.21 security_username: websphere # use encrypted password security_password: dummypassword diff --git a/roles/websphere/vars/v9.0.5.21.yml b/roles/websphere/vars/v9.0.5.21.yml new file mode 100644 index 0000000..7fbb1be --- /dev/null +++ b/roles/websphere/vars/v9.0.5.21.yml @@ -0,0 +1,17 @@ +--- +# FP Vars +websphere_pid: v90_9.0.5021.20240823_1839 +websphere_fp_path: WAS/9.0.5Fixpacks +websphere_fp_archive_list: + - 9.0.5-WS-WAS-FP021.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.30-linux-x64-installmgr.zip +websphere_java_pid: com.ibm.java.jdk.v8 +websphere_java_home: java/8.0