Skip to content

Commit 31d347d

Browse files
martinfanning1Martin Fanning
andauthored
Misc Updates around Molecule tests incl WLS 12.2.14 support, and small tidy up (#140)
Remove old molecule tests - that are either no longer called or needed - Remove old DB2 molecule tests - but leaving the latest on each line - Remove WLP JDK17 tests & var files as we will no longer use now that we are moved to 21. Add in new molecule tests - New test for WebLogic 12.2.1.4 as we have re-introduced support for this version. Test also added to Github actions run - New test & var files added for WebSphere 8.5.5.28 - so we can test and verify latest ficpack versions here. No Github action run added as not often we will deploy this on a VM, so testing locally is enough in my view. Tody up naming convention on Oracle molecule tests - With introducing WebLogic 14.1.2 and now 12.2.14 - felt it necessary to tidy up names of molecule tests to make it clearer when running locally and on Git action runs. - Also updated Oracle DB and OHS tests to match the naming convention i.e. <Middleware>-<Version>-<Platform> - Also updated the WLP test to speify JDK* to distinguish better from existing JDK21 test.. Co-authored-by: Martin Fanning <mfanning@merative.com>
1 parent 8d0aaeb commit 31d347d

File tree

30 files changed

+63
-240
lines changed

30 files changed

+63
-240
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,20 @@ jobs:
3636
- websphere-v90-rockylinux9
3737
- db21212
3838
- db21159
39-
- ohs-v12.2.1.4-rockylinux8
40-
- ohs-v12.2.1.4-rockylinux9
41-
- weblogic-rockylinux8
42-
- weblogic-rockylinux9
39+
- ohs-12214-rockylinux8
40+
- ohs-12214-rockylinux9
41+
- weblogic-12214-rockylinux8
42+
- weblogic-12214-rockylinux9
43+
- weblogic-1411-rockylinux8
44+
- weblogic-1411-rockylinux9
4345
- weblogic-1412-rockylinux8
4446
- weblogic-1412-rockylinux9
45-
- oracle19c-rockylinux8
46-
- oracle19c-rockylinux9
47+
- oracle-19c-rockylinux8
48+
- oracle-19c-rockylinux9
4749
- iim-191-rockylinux8
4850
- iim-191-rockylinux9
49-
- liberty-rockylinux8
50-
- liberty-rockylinux9
51-
- liberty-jdk17-rockylinux8
51+
- liberty-jdk8-rockylinux8
52+
- liberty-jdk8-rockylinux9
5253
- liberty-jdk21-rockylinux8
5354
- liberty-jdk21-rockylinux9
5455
steps:

galaxy.yml

Lines changed: 1 addition & 1 deletion
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.9.6
14+
version: 1.9.7
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-v85/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- merative.spm_middleware
77

88
vars:
9-
ihs_version: 8.5.5.27
9+
ihs_version: 8.5.5.28
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/__liberty17/converge.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

molecule/__liberty17/verify.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

molecule/__websphere-v85/converge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- merative.spm_middleware
77

88
vars:
9-
websphere_version: 8.5.5.27
9+
websphere_version: 8.5.5.28
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-v85/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
- name: Check that JspBatchCompiler has been patched
2828
assert:
2929
that:
30-
- "{{ '-Xmx1024m' in (jsp_compiler_sh['content'] | b64decode) }}"
30+
- "{{ '-Xmx1600m' in (jsp_compiler_sh['content'] | b64decode) }}"
3131

3232
- name: Check that environment file has been created correctly
3333
assert:

molecule/db21145/converge.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

molecule/db21145/molecule.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

molecule/db21145/verify.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)