Skip to content

Commit d6dcde3

Browse files
authored
Update third party version to latest (#58)
* Update Websphere to 9.0.5 FP17 * Update WebSphere Liberty to v23.0.0.9 * Remove old WebSphere Liberty Versions * Remove Old WebSphere Versions * Update iim agent version for converge * update ihs_version for converge * Introduction of Db2 11.5.8 * update Galaxy version
1 parent 98beb65 commit d6dcde3

30 files changed

+106
-143
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
matrix:
3232
scenario:
3333
- websphere-v90-rockylinux8
34-
- db21157
34+
- db21158
3535
- oracle19c-rockylinux8
3636
- iim-191-rockylinux8
3737
- ihs-v90-rockylinux8

galaxy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ name: spm_middleware
1111

1212
# The version of the collection. Must be compatible with semantic versioning
1313
# Please note. version also exists in /github/workflows/release.yml and will need to be update also
14-
version: 1.2.9
14+
version: 1.3.0
1515

1616
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
1717
readme: README.md

molecule/__ihs-v90/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- merative.spm_middleware
77

88
vars:
9-
ihs_version: 9.0.5.8
9+
ihs_version: 9.0.5.17
1010
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
1111
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}
1212

molecule/__websphere-v90/converge.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
- merative.spm_middleware
77

88
vars:
9-
iim_agent_version: 1.9.1001.20191112_1525
9+
iim_agent_version: 1.9.2005.20230718_1844
1010
iim_install_path: /opt/IBM/InstallationManager
11-
websphere_version: 9.0.5.10
11+
websphere_version: 9.0.5.17
1212
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
1313
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}
1414

molecule/db21158/converge.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
- name: Converge
3+
hosts: all
4+
5+
collections:
6+
- merative.spm_middleware
7+
8+
roles:
9+
- db2
10+
11+
vars:
12+
db2_version: "11.5.8.0"
13+
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
14+
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}

molecule/db21158/molecule.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
driver:
3+
name: docker
4+
provider:
5+
name: docker
6+
7+
lint: |
8+
set -e
9+
yamllint .
10+
11+
platforms:
12+
- name: rockylinux8
13+
image: rockylinux:8
14+
dockerfile: ../_resources/Dockerfile.j2
15+
pre_build_image: false
16+
privileged: true
17+
volume_mounts:
18+
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
19+
command: "/usr/sbin/init"
20+
environment:
21+
container: docker
22+
23+
provisioner:
24+
name: ansible
25+
log: true
26+
config_options:
27+
defaults:
28+
stderr_callback: debug
29+
stdout_callback: debug
30+
env:
31+
ANSIBLE_FORCE_COLOR: 'true'
32+
playbooks:
33+
converge: ./converge.yml
34+
verify: ./verify.yml

molecule/db21158/verify.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
- name: Verify
3+
hosts: all
4+
pre_tasks:
5+
- stat: "path=/opt/Props/Bootstrap.properties"
6+
register: boot_props
7+
- command: "db2level"
8+
become: true
9+
become_user: "db2admin"
10+
become_method: sudo
11+
become_flags: "-i"
12+
register: db2level_cmd
13+
14+
tasks:
15+
- name: Check that Bootstrap.properties exists
16+
assert:
17+
that: boot_props.stat.exists
18+
- name: Check that the db2level command is working
19+
assert:
20+
that:
21+
- db2level_cmd.rc == 0
22+
- "'v11.5.8' in db2level_cmd.stdout"

molecule/iim-191-rockylinux8/converge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
- iim
1010

1111
vars:
12-
iim_agent_version: 1.9.1001.20191112_1525
12+
iim_agent_version: 1.9.2005.20230718_1844
1313
download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers"
1414
download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"}

roles/db2/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ instance_id: inst1
33
instance_port: 50000
44

55
db2_install_path: /opt/IBM/db2
6-
db2_version: 11.5.7.0
6+
db2_version: 11.5.8.0
77
db2_product: DB2_SERVER_EDITION
88
db2_bypass_prereq_check: false
99
db2_activate: True

roles/db2/vars/v11.5.8.0.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
# paths can be relative to download_url or local
3+
db2_installer_path: DB2/11.5/v11.5.8_linuxx64_universal_fixpack.tar.gz
4+
db2_license_path: DB2/11.5/db2ese_u.lic

roles/ihs/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ NOTE: ihs_admin_pass should be changed after first installation.
1313
| `ihs_install_path` | `/opt/IBM/HTTPServer` |
1414
| `plg_install_path` | `/opt/IBM/WebSphere/Plugins` |
1515
| `wct_install_path` | `/opt/IBM/WebSphere/Toolbox` |
16-
| `ihs_version` | `9.0.5.8` |
16+
| `ihs_version` | `9.0.5.17` |
1717
| `ihs_config_type` | `local_distributed` |
1818
| `ihs_admin_user` | `wasadmin` |
1919
| `ihs_admin_pass` | `wasadmin` |
2020
| ----------------------- | --------------------------------------------------- |
21-
| Version-specific: | Values from `9.0.5.8` |
21+
| Version-specific: | Values from `9.0.5.17` |
2222
| ----------------------- | --------------------------------------------------- |
2323
| `ihs_installer_archive_list` | `was.repo.90500.[ihs|plugins|wct].zip` |
24-
| `ihs_fp_installer_path` | `WAS/9.0.5Fixpacks` |
24+
| `ihs_fp_installer_path` | `WAS/9.0.17Fixpacks` |
2525
| `ihs_fp_installer_archive_list` | `9.0.5-WS-[IHSPLG|WCT]-FP008.zip` |
26-
| `ihs_pid` | `v90_9.0.5008.20210525_1601` |
27-
| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-6.26-linux-x64-installmgr.zip` |
26+
| `ihs_pid` | `v90_9.0.5017.20230818_1035` |
27+
| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip` |
2828
| `ihs_java_pid` | `com.ibm.java.jdk.v8` |
2929
| ----------------------- | --------------------------------------------------- |
3030
| `iim_install_path` | `/opt/IBM/InstallationManager` |

roles/ihs/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ihs_install_path: /opt/IBM/HTTPServer
55
plg_install_path: /opt/IBM/WebSphere/Plugins
66
wct_install_path: /opt/IBM/WebSphere/Toolbox
77

8-
ihs_version: 9.0.5.8
8+
ihs_version: 9.0.5.17
99

1010
ihs_config_type: local_distributed
1111
ihs_admin_user: wasadmin

roles/ihs/vars/v9.0.5.3.yml renamed to roles/ihs/vars/v9.0.5.17.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ihs_installer_archive_list:
77

88
ihs_fp_installer_path: WAS/9.0.5Fixpacks
99
ihs_fp_installer_archive_list:
10-
- 9.0.5-WS-IHSPLG-FP003.zip
11-
- 9.0.5-WS-WCT-FP003.zip
10+
- 9.0.5-WS-IHSPLG-FP017.zip
11+
- 9.0.5-WS-WCT-FP017.zip
1212

13-
ihs_pid: v90_9.0.5003.20200226_0941
13+
ihs_pid: v90_9.0.5017.20230818_1035
1414

15-
ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-6.15-linux-x64-installmgr.zip
15+
ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip
1616
ihs_java_pid: com.ibm.java.jdk.v8

roles/ihs/vars/v9.0.5.7.yml

-16
This file was deleted.

roles/ihs/vars/v9.0.5.8.yml

-16
This file was deleted.

roles/iim/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ None
1010

1111
| Property Name | Default value |
1212
| ------------------- | ----------------------------------------------------- |
13-
| `iim_agent_version` | `1.9.1001.20191112_1525` |
13+
| `iim_agent_version` | `1.9.2005.20230718_1844` |
1414
| `iim_install_path` | `/opt/IBM/InstallationManager` |
1515
| `download_url` | # Set this if license and installer is being downloaded from a http server|
1616
| `download_header` | # Use this in conjunction with `download_url` |

roles/iim/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
iim_agent_version: 1.9.1001.20191112_1525
2+
iim_agent_version: 1.9.2005.20230718_1844
33
# Server info for downloading installers / repos directly, leave blank to copy
44
download_url: # e.g. https://artifactory/repo
55
download_header: # e.g. X-JFrog-Art-Api: "{{ lookup('env', 'MYTOKEN') }}"

roles/liberty/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ IBM Installation Manager (1.9.x) must already be installed in the target environ
1111
| Property Name | Default value |
1212
| ----------------------- | --------------------------------------------------- |
1313
| `liberty_install_path` | `/opt/IBM/WebSphere/Liberty` |
14-
| `liberty_version` | `23.0.0.6` |
14+
| `liberty_version` | `23.0.0.9` |
1515
| `liberty_default_heapsize` | `1024m` |
1616
| `liberty_enable_verbose_gc` | `false` |
1717
| `liberty_extra_jvm_options` | `[]` |

roles/liberty/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ iim_install_path: /opt/IBM/InstallationManager
33

44
liberty_install_path: /opt/IBM/WebSphere/Liberty
55

6-
liberty_version: 23.0.0.6
6+
liberty_version: 23.0.0.9
77

88
# Default JVM Options
99
liberty_default_heapsize: 1024m

roles/liberty/vars/v19.0.0.12.yml

-7
This file was deleted.

roles/liberty/vars/v20.0.0.12.yml

-7
This file was deleted.

roles/liberty/vars/v20.0.0.9.yml

-7
This file was deleted.

roles/liberty/vars/v21.0.0.9.yml

-7
This file was deleted.

roles/liberty/vars/v23.0.0.7.yml

-7
This file was deleted.

roles/liberty/vars/v23.0.0.9.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
liberty_fp_path: WLP/23.0.0.9-WS-LIBERTY-ND-FP.zip
3+
liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip
4+
liberty_pid: 23.0.9.20230904_1159
5+
6+
liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip
7+
liberty_java_pid: com.ibm.java.jdk.v8_8.0.8010.20230721_1038

roles/websphere/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
iim_install_path: /opt/IBM/InstallationManager
44
# websphere
55
websphere_install_path: /opt/IBM/WebSphere/AppServer
6-
websphere_version: 9.0.5.10
6+
websphere_version: 9.0.5.17
77
security_username: websphere
88
# use encrypted password
99
security_password: dummypassword
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
# FP Vars
3-
websphere_pid: v90_9.0.5007.20210301_1241
3+
websphere_pid: v90_9.0.5017.20230818_1035
44
websphere_fp_path: WAS/9.0.5Fixpacks
55
websphere_fp_archive_list:
6-
- 9.0.5-WS-WAS-FP007.zip
6+
- 9.0.5-WS-WAS-FP017.zip
77

88
# Base Vars
99
websphere_base_pid: com.ibm.websphere.ND.v90
@@ -12,6 +12,6 @@ websphere_base_archive_list:
1212
- was.repo.90500.nd.zip
1313

1414
# Java Vars
15-
websphere_java_path: Java/IBM/ibm-java-sdk-8.0-6.26-linux-x64-installmgr.zip
15+
websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip
1616
websphere_java_pid: com.ibm.java.jdk.v8
1717
websphere_java_home: java/8.0

roles/websphere/vars/v9.0.5.3.yml

-17
This file was deleted.

roles/websphere/vars/v9.0.5.8.yml

-17
This file was deleted.

roles/websphere/vars/v9.0.5.9.yml

-17
This file was deleted.

0 commit comments

Comments
 (0)