From 7d801aa0aebe529d4ee8203c4fab9c60dab31313 Mon Sep 17 00:00:00 2001 From: Roman Muntean Date: Mon, 5 Feb 2024 18:46:56 +0000 Subject: [PATCH 1/4] websphere v18 --- roles/ihs/vars/v9.0.5.18.yml | 19 +++++++++++++++++++ roles/websphere/vars/v9.0.5.18.yml | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 roles/ihs/vars/v9.0.5.18.yml create mode 100644 roles/websphere/vars/v9.0.5.18.yml diff --git a/roles/ihs/vars/v9.0.5.18.yml b/roles/ihs/vars/v9.0.5.18.yml new file mode 100644 index 00000000..38402ec8 --- /dev/null +++ b/roles/ihs/vars/v9.0.5.18.yml @@ -0,0 +1,19 @@ +--- +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-FP017.zip + # - 9.0.5-WS-IHSPLG-FP018.zip + # - 9.0.5-WS-WCT-FP017.zip + - 9.0.5-WS-WCT-FP018.zip + +ihs_pid: v90_9.0.5017.20230818_1035 + +# ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip +ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip +ihs_java_pid: com.ibm.java.jdk.v8 diff --git a/roles/websphere/vars/v9.0.5.18.yml b/roles/websphere/vars/v9.0.5.18.yml new file mode 100644 index 00000000..ef8cbb1a --- /dev/null +++ b/roles/websphere/vars/v9.0.5.18.yml @@ -0,0 +1,18 @@ +--- +# FP Vars +websphere_pid: v90_9.0.5018.20231113_1345 +websphere_fp_path: WAS/9.0.5Fixpacks +websphere_fp_archive_list: + - 9.0.5-WS-WAS-FP018.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.10-linux-x64-installmgr.zip +websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip +websphere_java_pid: com.ibm.java.jdk.v8 +websphere_java_home: java/8.0 From be8e776870d61a27a7d67a710e365b12bde877a9 Mon Sep 17 00:00:00 2001 From: Roman Muntean Date: Tue, 6 Feb 2024 12:56:56 +0000 Subject: [PATCH 2/4] cleanup, push tested code --- roles/ihs/vars/v9.0.5.18.yml | 7 ++----- roles/websphere/vars/v9.0.5.18.yml | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/roles/ihs/vars/v9.0.5.18.yml b/roles/ihs/vars/v9.0.5.18.yml index 38402ec8..cfeb1989 100644 --- a/roles/ihs/vars/v9.0.5.18.yml +++ b/roles/ihs/vars/v9.0.5.18.yml @@ -7,13 +7,10 @@ ihs_installer_archive_list: ihs_fp_installer_path: WAS/9.0.5Fixpacks ihs_fp_installer_archive_list: - - 9.0.5-WS-IHSPLG-FP017.zip - # - 9.0.5-WS-IHSPLG-FP018.zip - # - 9.0.5-WS-WCT-FP017.zip + - 9.0.5-WS-IHSPLG-FP018.zip - 9.0.5-WS-WCT-FP018.zip -ihs_pid: v90_9.0.5017.20230818_1035 +ihs_pid: v90_9.0.5018.20231113_1345 -# ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip ihs_java_pid: com.ibm.java.jdk.v8 diff --git a/roles/websphere/vars/v9.0.5.18.yml b/roles/websphere/vars/v9.0.5.18.yml index ef8cbb1a..f5afa111 100644 --- a/roles/websphere/vars/v9.0.5.18.yml +++ b/roles/websphere/vars/v9.0.5.18.yml @@ -12,7 +12,6 @@ websphere_base_archive_list: - was.repo.90500.nd.zip # Java Vars -# websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.15-linux-x64-installmgr.zip websphere_java_pid: com.ibm.java.jdk.v8 websphere_java_home: java/8.0 From cd9c18cf6959db113e10cf5eda629eddf4138f70 Mon Sep 17 00:00:00 2001 From: Roman Muntean Date: Tue, 6 Feb 2024 14:14:41 +0000 Subject: [PATCH 3/4] Fergal review changes --- galaxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index 0fd1771c..873eefa1 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.4.3 +version: 1.4.4 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md From f81165717b2ae8d797e844fa00f4b0e0fade643a Mon Sep 17 00:00:00 2001 From: Roman Muntean Date: Tue, 6 Feb 2024 14:15:02 +0000 Subject: [PATCH 4/4] fergal review changes --- 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/iim/README.md | 2 +- roles/iim/defaults/main.yml | 3 ++- roles/websphere/defaults/main.yml | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/molecule/__ihs-v90/converge.yml b/molecule/__ihs-v90/converge.yml index 043b902b..d87a7ceb 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.17 + ihs_version: 9.0.5.18 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 0e8e9a93..c192d9ed 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.2005.20230718_1844 + iim_agent_version: 1.9.2006.20230925_1323 iim_install_path: /opt/IBM/InstallationManager - websphere_version: 9.0.5.17 + websphere_version: 9.0.5.18 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 9e3c9b87..6c3cefd2 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.2005.20230718_1844 + iim_agent_version: 1.9.2006.20230925_1323 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 f558e1f3..7ba4cfa8 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.17` | +| `ihs_version` | `9.0.5.18` | | `ihs_config_type` | `local_distributed` | | `ihs_admin_user` | `wasadmin` | | `ihs_admin_pass` | `wasadmin` | | ----------------------- | --------------------------------------------------- | -| Version-specific: | Values from `9.0.5.17` | +| Version-specific: | Values from `9.0.5.18` | | ----------------------- | --------------------------------------------------- | | `ihs_installer_archive_list` | `was.repo.90500.[ihs|plugins|wct].zip` | -| `ihs_fp_installer_path` | `WAS/9.0.17Fixpacks` | -| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP008.zip` | -| `ihs_pid` | `v90_9.0.5017.20230818_1035` | -| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip` | +| `ihs_fp_installer_path` | `WAS/9.0.5Fixpacks` | +| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP018.zip` | +| `ihs_pid` | `v90_9.0.5018.20231113_1345` | +| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-8.15-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: 8.5.5.17 + - ihs_version: 9.0.5.18 - 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 f5d545cd..b6efb8d8 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.17 +ihs_version: 9.0.5.18 ihs_config_type: local_distributed ihs_admin_user: wasadmin diff --git a/roles/iim/README.md b/roles/iim/README.md index c4d8f045..e1ac4fae 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.2005.20230718_1844` | +| `iim_agent_version` | `1.9.2006.20230925_1323` | | `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 feeb7ce9..00c1a313 100644 --- a/roles/iim/defaults/main.yml +++ b/roles/iim/defaults/main.yml @@ -1,5 +1,6 @@ --- -iim_agent_version: 1.9.2005.20230718_1844 +iim_agent_version: 1.9.2006.20230925_1323 + # Server info for downloading installers / repos directly, leave blank to copy download_url: # e.g. https://artifactory/repo download_header: # e.g. X-JFrog-Art-Api: "{{ lookup('env', 'MYTOKEN') }}" diff --git a/roles/websphere/defaults/main.yml b/roles/websphere/defaults/main.yml index 118e3d34..29c96cbc 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.17 +websphere_version: 9.0.5.18 security_username: websphere # use encrypted password security_password: dummypassword