Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update third party version to latest #58

Merged
merged 8 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
matrix:
scenario:
- websphere-v90-rockylinux8
- db21157
- db21158
- oracle19c-rockylinux8
- iim-191-rockylinux8
- ihs-v90-rockylinux8
Expand Down
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.9
version: 1.3.0

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
2 changes: 1 addition & 1 deletion molecule/__ihs-v90/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

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

Expand Down
4 changes: 2 additions & 2 deletions molecule/__websphere-v90/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
- merative.spm_middleware

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

Expand Down
14 changes: 14 additions & 0 deletions molecule/db21158/converge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
- name: Converge
hosts: all

collections:
- merative.spm_middleware

roles:
- db2

vars:
db2_version: "11.5.8.0"
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}
34 changes: 34 additions & 0 deletions molecule/db21158/molecule.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
driver:
name: docker
provider:
name: docker

lint: |
set -e
yamllint .

platforms:
- name: rockylinux8
image: rockylinux:8
dockerfile: ../_resources/Dockerfile.j2
pre_build_image: false
privileged: true
volume_mounts:
- "/sys/fs/cgroup:/sys/fs/cgroup:rw"
command: "/usr/sbin/init"
environment:
container: docker

provisioner:
name: ansible
log: true
config_options:
defaults:
stderr_callback: debug
stdout_callback: debug
env:
ANSIBLE_FORCE_COLOR: 'true'
playbooks:
converge: ./converge.yml
verify: ./verify.yml
22 changes: 22 additions & 0 deletions molecule/db21158/verify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
- name: Verify
hosts: all
pre_tasks:
- stat: "path=/opt/Props/Bootstrap.properties"
register: boot_props
- command: "db2level"
become: true
become_user: "db2admin"
become_method: sudo
become_flags: "-i"
register: db2level_cmd

tasks:
- name: Check that Bootstrap.properties exists
assert:
that: boot_props.stat.exists
- name: Check that the db2level command is working
assert:
that:
- db2level_cmd.rc == 0
- "'v11.5.8' in db2level_cmd.stdout"
2 changes: 1 addition & 1 deletion molecule/iim-191-rockylinux8/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
- iim

vars:
iim_agent_version: 1.9.1001.20191112_1525
iim_agent_version: 1.9.2005.20230718_1844
download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"}
2 changes: 1 addition & 1 deletion roles/db2/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ instance_id: inst1
instance_port: 50000

db2_install_path: /opt/IBM/db2
db2_version: 11.5.7.0
db2_version: 11.5.8.0
db2_product: DB2_SERVER_EDITION
db2_bypass_prereq_check: false
db2_activate: True
Expand Down
4 changes: 4 additions & 0 deletions roles/db2/vars/v11.5.8.0.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
# paths can be relative to download_url or local
db2_installer_path: DB2/11.5/v11.5.8_linuxx64_universal_fixpack.tar.gz
db2_license_path: DB2/11.5/db2ese_u.lic
10 changes: 5 additions & 5 deletions roles/ihs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.8` |
| `ihs_version` | `9.0.5.17` |
| `ihs_config_type` | `local_distributed` |
| `ihs_admin_user` | `wasadmin` |
| `ihs_admin_pass` | `wasadmin` |
| ----------------------- | --------------------------------------------------- |
| Version-specific: | Values from `9.0.5.8` |
| Version-specific: | Values from `9.0.5.17` |
| ----------------------- | --------------------------------------------------- |
| `ihs_installer_archive_list` | `was.repo.90500.[ihs|plugins|wct].zip` |
| `ihs_fp_installer_path` | `WAS/9.0.5Fixpacks` |
| `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.5008.20210525_1601` |
| `ihs_java_zip_path` | `Java/IBM/ibm-java-sdk-8.0-6.26-linux-x64-installmgr.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_pid` | `com.ibm.java.jdk.v8` |
| ----------------------- | --------------------------------------------------- |
| `iim_install_path` | `/opt/IBM/InstallationManager` |
Expand Down
2 changes: 1 addition & 1 deletion roles/ihs/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
ihs_version: 9.0.5.17

ihs_config_type: local_distributed
ihs_admin_user: wasadmin
Expand Down
8 changes: 4 additions & 4 deletions roles/ihs/vars/v9.0.5.3.yml → roles/ihs/vars/v9.0.5.17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ihs_installer_archive_list:

ihs_fp_installer_path: WAS/9.0.5Fixpacks
ihs_fp_installer_archive_list:
- 9.0.5-WS-IHSPLG-FP003.zip
- 9.0.5-WS-WCT-FP003.zip
- 9.0.5-WS-IHSPLG-FP017.zip
- 9.0.5-WS-WCT-FP017.zip

ihs_pid: v90_9.0.5003.20200226_0941
ihs_pid: v90_9.0.5017.20230818_1035

ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-6.15-linux-x64-installmgr.zip
ihs_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip
ihs_java_pid: com.ibm.java.jdk.v8
16 changes: 0 additions & 16 deletions roles/ihs/vars/v9.0.5.7.yml

This file was deleted.

16 changes: 0 additions & 16 deletions roles/ihs/vars/v9.0.5.8.yml

This file was deleted.

2 changes: 1 addition & 1 deletion roles/iim/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ None

| Property Name | Default value |
| ------------------- | ----------------------------------------------------- |
| `iim_agent_version` | `1.9.1001.20191112_1525` |
| `iim_agent_version` | `1.9.2005.20230718_1844` |
| `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` |
Expand Down
2 changes: 1 addition & 1 deletion roles/iim/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
iim_agent_version: 1.9.1001.20191112_1525
iim_agent_version: 1.9.2005.20230718_1844
# 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') }}"
2 changes: 1 addition & 1 deletion roles/liberty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ IBM Installation Manager (1.9.x) must already be installed in the target environ
| Property Name | Default value |
| ----------------------- | --------------------------------------------------- |
| `liberty_install_path` | `/opt/IBM/WebSphere/Liberty` |
| `liberty_version` | `23.0.0.6` |
| `liberty_version` | `23.0.0.9` |
| `liberty_default_heapsize` | `1024m` |
| `liberty_enable_verbose_gc` | `false` |
| `liberty_extra_jvm_options` | `[]` |
Expand Down
2 changes: 1 addition & 1 deletion roles/liberty/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ iim_install_path: /opt/IBM/InstallationManager

liberty_install_path: /opt/IBM/WebSphere/Liberty

liberty_version: 23.0.0.6
liberty_version: 23.0.0.9

# Default JVM Options
liberty_default_heapsize: 1024m
Expand Down
7 changes: 0 additions & 7 deletions roles/liberty/vars/v19.0.0.12.yml

This file was deleted.

7 changes: 0 additions & 7 deletions roles/liberty/vars/v20.0.0.12.yml

This file was deleted.

7 changes: 0 additions & 7 deletions roles/liberty/vars/v20.0.0.9.yml

This file was deleted.

7 changes: 0 additions & 7 deletions roles/liberty/vars/v21.0.0.9.yml

This file was deleted.

7 changes: 0 additions & 7 deletions roles/liberty/vars/v23.0.0.7.yml

This file was deleted.

7 changes: 7 additions & 0 deletions roles/liberty/vars/v23.0.0.9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
liberty_fp_path: WLP/23.0.0.9-WS-LIBERTY-ND-FP.zip
liberty_installers_path: WLP/was.repo.16002.liberty.nd.zip
liberty_pid: 23.0.9.20230904_1159

liberty_java_zip_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip
liberty_java_pid: com.ibm.java.jdk.v8_8.0.8010.20230721_1038
2 changes: 1 addition & 1 deletion roles/websphere/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
iim_install_path: /opt/IBM/InstallationManager
# websphere
websphere_install_path: /opt/IBM/WebSphere/AppServer
websphere_version: 9.0.5.10
websphere_version: 9.0.5.17
security_username: websphere
# use encrypted password
security_password: dummypassword
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
# FP Vars
websphere_pid: v90_9.0.5007.20210301_1241
websphere_pid: v90_9.0.5017.20230818_1035
websphere_fp_path: WAS/9.0.5Fixpacks
websphere_fp_archive_list:
- 9.0.5-WS-WAS-FP007.zip
- 9.0.5-WS-WAS-FP017.zip

# Base Vars
websphere_base_pid: com.ibm.websphere.ND.v90
Expand All @@ -12,6 +12,6 @@ websphere_base_archive_list:
- was.repo.90500.nd.zip

# Java Vars
websphere_java_path: Java/IBM/ibm-java-sdk-8.0-6.26-linux-x64-installmgr.zip
websphere_java_path: Java/IBM/ibm-java-sdk-8.0-8.10-linux-x64-installmgr.zip
websphere_java_pid: com.ibm.java.jdk.v8
websphere_java_home: java/8.0
17 changes: 0 additions & 17 deletions roles/websphere/vars/v9.0.5.3.yml

This file was deleted.

17 changes: 0 additions & 17 deletions roles/websphere/vars/v9.0.5.8.yml

This file was deleted.

17 changes: 0 additions & 17 deletions roles/websphere/vars/v9.0.5.9.yml

This file was deleted.