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

Wlp updates #110

Merged
merged 14 commits into from
Dec 17, 2024
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.7.8
version: 1.7.9

# 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/__liberty/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

vars:
liberty_version: "24.0.0.9"
liberty_version: "24.0.0.12"
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}

Expand Down
2 changes: 1 addition & 1 deletion molecule/__liberty17/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

vars:
liberty_version: "24.0.0.9-JDK17"
liberty_version: "24.0.0.12-JDK17"
download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}

Expand Down
2 changes: 1 addition & 1 deletion molecule/__liberty21/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- merative.spm_middleware

vars:
liberty_version: "24.0.0.9-JDK21"
liberty_version: "24.0.0.12-JDK21"
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 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` | `24.0.0.9` |
| `liberty_version` | `24.0.0.12` |
| `liberty_default_heapsize` | `1024m` |
| `liberty_enable_verbose_gc` | `false` |
| `liberty_extra_jvm_options` | `[]` |
Expand All @@ -37,7 +37,7 @@ None
- hosts: servers
roles:
- role: merative.spm_middleware.liberty
liberty_version: 24.0.0.9
liberty_version: 24.0.0.12
```

## License
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: 24.0.0.9
liberty_version: 24.0.0.12

jdk_version: 8.0

Expand Down
8 changes: 8 additions & 0 deletions roles/liberty/vars/v24.0.0.12-JDK17.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
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
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
7 changes: 7 additions & 0 deletions roles/liberty/vars/v24.0.0.12-JDK21.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
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
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
7 changes: 7 additions & 0 deletions roles/liberty/vars/v24.0.0.12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
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
Loading