diff --git a/galaxy.yml b/galaxy.yml index f85c1a3..47c56a5 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.7.4 +version: 1.7.5 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/ohs/tasks/main.yml b/roles/ohs/tasks/main.yml index b73d219..542bea5 100644 --- a/roles/ohs/tasks/main.yml +++ b/roles/ohs/tasks/main.yml @@ -37,10 +37,11 @@ - name: Print ohs_version_status debug: msg: "{{ ohs_version_status }}" + when: ohs_version is defined - name: Patch OHS include_tasks: "patch.yml" - when: ohs_version_status.results | selectattr('rc','greaterthan',0) | list | count > 0 + when: ohs_version is defined and ohs_version_status.results | selectattr('rc','greaterthan',0) | list | count > 0 - name: Set up properties file include_tasks: "config.yml" diff --git a/roles/ohs/vars/v12.2.1.4.0.yml b/roles/ohs/vars/v12.2.1.4.0.yml new file mode 100644 index 0000000..53a4e99 --- /dev/null +++ b/roles/ohs/vars/v12.2.1.4.0.yml @@ -0,0 +1,24 @@ +--- +# Base installer values +ohs_version_folder: 12.2.1 +base_version: 12.2.1.4.0 +base_installer: fmw_12.2.1.4.0_ohs_linux64.bin +base_installer_path: "OHS/12.2.1/fmw_12.2.1.4.0_ohs_linux64.bin" +# Patches information +#ohs_version: 12.2.1.4.240115 +#patches: +# - filename: "OHS/{{ ohs_version_folder }}/p36187026_122140_Linux-x86-64.zip" +# number: 36187026 +# - filename: "OHS/{{ ohs_version_folder }}/p31101341_122140_Generic.zip" +# number: 31101341 +# Add OPatch values when bundled OPatch needs to be upgraded +opatch_filename_path: "WLS/Patches/p28186730_1394215_Generic.zip" +opatch_version: 13.9.4.2.15 +opatch_folder: 6880880 + +# Full jdk is needed to update OPatch +java_zip_path: 'WLS/jdk-8u411-linux-x64.tar.gz' +java_version_path: 'jdk1.8.0_411' +jdk_folder: "{{ ohs_home }}/oracle_common/jdk" + +template_jar: "ohs_standalone_template.jar"