From 383694ea88c1883d7d3a555e43f190dfd72ce336 Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Mon, 20 May 2024 16:59:45 +0100 Subject: [PATCH] Update to WebLogic 14.1.1.0.240328 Update to WebLogic 14.1.1.0.240328 Use Java 1.8.0_411 Update OPatch version Update molecule tests Update galaxy.yml --- galaxy.yml | 2 +- molecule/__weblogic-v14.1/converge.yml | 2 +- molecule/__weblogic-v14.1/verify.yml | 2 +- roles/weblogic/defaults/main.yml | 2 +- roles/weblogic/vars/v14.1.1.0.240328.yml | 11 +++++++++++ 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 roles/weblogic/vars/v14.1.1.0.240328.yml diff --git a/galaxy.yml b/galaxy.yml index 5984bb5..137ca54 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.5.9 +version: 1.6.0 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/molecule/__weblogic-v14.1/converge.yml b/molecule/__weblogic-v14.1/converge.yml index ae8a6c8..8378391 100644 --- a/molecule/__weblogic-v14.1/converge.yml +++ b/molecule/__weblogic-v14.1/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - weblogic_version: "14.1.1.0.231220" + weblogic_version: "14.1.1.0.240328" # weblogic_installer_path: /opt/IBM/weblogic/WLS download_url: "{{ lookup('env','ARTIFACTORY_URL') }}/{{ lookup('env','ARTIFACTORY_REPO') }}/SoftwareInstallers" download_header: {'X-JFrog-Art-Api': "{{ lookup('env','ARTIFACTORY_TOKEN' )}}"} diff --git a/molecule/__weblogic-v14.1/verify.yml b/molecule/__weblogic-v14.1/verify.yml index 8019bcc..3bd8790 100644 --- a/molecule/__weblogic-v14.1/verify.yml +++ b/molecule/__weblogic-v14.1/verify.yml @@ -5,7 +5,7 @@ - name: include defaults include_vars: "../../roles/weblogic/defaults/main.yml" - name: include vars - include_vars: "../../roles/weblogic/vars/v14.1.1.0.231220.yml" + include_vars: "../../roles/weblogic/vars/v14.1.1.0.240328.yml" - stat: path: /opt/Props/AppServer.properties register: boot_props diff --git a/roles/weblogic/defaults/main.yml b/roles/weblogic/defaults/main.yml index 5a6b733..8c3a5ad 100644 --- a/roles/weblogic/defaults/main.yml +++ b/roles/weblogic/defaults/main.yml @@ -5,7 +5,7 @@ weblogic_group: 'oinstall' weblogic_os_user_pass: 'oracle' weblogic_base: '/home/oracle' # If not passed in, use this default value -weblogic_version: '14.1.1.0.231220' +weblogic_version: '14.1.1.0.240328' inv_loc: '/opt/Oracle/oraInventory' jdk_folder: '/usr/java' # Common paths and names diff --git a/roles/weblogic/vars/v14.1.1.0.240328.yml b/roles/weblogic/vars/v14.1.1.0.240328.yml new file mode 100644 index 0000000..bf328fc --- /dev/null +++ b/roles/weblogic/vars/v14.1.1.0.240328.yml @@ -0,0 +1,11 @@ +--- +base_install_file: 'fmw_14.1.1.0.0_wls.jar' +weblogic_version: 14.1 +opatch: 'p28186730_1394215_Generic.zip' +opatch_version: 13.9.4.2.15 +patch: 'p36454290_141100_Generic.zip' +patch_number: 36454290 +napply: false +patch_folder: '36454290' +java_archive_file: jdk-8u411-linux-x64.tar.gz +java_version_path: 'jdk1.8.0_411'