From 3eaaf4bba5969e198a4d317865ce51b843a0e711 Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Fri, 18 Oct 2024 10:36:28 +0100 Subject: [PATCH 1/2] Update to WebLogic 14.1.1.0.240922 Update to WebLogic 14.1.1.0.240922 Use Java 1.8.0_431 Update OPatch to 13.9.4.2.17 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/README.md | 6 +++--- roles/weblogic/defaults/main.yml | 2 +- roles/weblogic/vars/v14.1.1.0.240922.yml | 11 +++++++++++ 6 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 roles/weblogic/vars/v14.1.1.0.240922.yml diff --git a/galaxy.yml b/galaxy.yml index f5d1e9e..1932086 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.2 +version: 1.7.3 # 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 24849c6..c9e9adf 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.240628" + weblogic_version: "14.1.1.0.240922" # 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 58a4e47..425fab8 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.240628.yml" + include_vars: "../../roles/weblogic/vars/v14.1.1.0.240922.yml" - stat: path: /opt/Props/AppServer.properties register: boot_props diff --git a/roles/weblogic/README.md b/roles/weblogic/README.md index c186404..2f3cb22 100644 --- a/roles/weblogic/README.md +++ b/roles/weblogic/README.md @@ -25,7 +25,7 @@ The `weblogc` role will install Weblogic. | | `12.2.1.4.210716` | | | `14.1.1.0.220105` | | | `14.1.1.0.240111` | -| | `14.1.1.0.240628` | +| | `14.1.1.0.240922` | ... @@ -38,7 +38,7 @@ Download WebLogic Server Installation packages and patch packages, and upload it The following explains the structure of this role. tasks/main.yml - - defaults/main.yml vars file is included (default weblogic_version is '14.1.1.0.240628' if no alternative is passed in with your ansible-playbook command) + - defaults/main.yml vars file is included (default weblogic_version is '14.1.1.0.240922' if no alternative is passed in with your ansible-playbook command) - runs: prereqs.yml - runs: install.yml - runs: patch.yml @@ -52,7 +52,7 @@ The version of the OPatch tool itself is also handed by the above tasks file. - hosts: servers roles: - role: merative.spm_middleware.weblogic - weblogic_version: 14.1.1.0.240628 + weblogic_version: 14.1.1.0.240922 ``` ## Note diff --git a/roles/weblogic/defaults/main.yml b/roles/weblogic/defaults/main.yml index 963de6d..0c2670c 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.240628' +weblogic_version: '14.1.1.0.240922' inv_loc: '/opt/Oracle/oraInventory' jdk_folder: '/usr/java' # Common paths and names diff --git a/roles/weblogic/vars/v14.1.1.0.240922.yml b/roles/weblogic/vars/v14.1.1.0.240922.yml new file mode 100644 index 0000000..fbf394e --- /dev/null +++ b/roles/weblogic/vars/v14.1.1.0.240922.yml @@ -0,0 +1,11 @@ +--- +base_install_file: 'fmw_14.1.1.0.0_wls.jar' +weblogic_version: 14.1 +opatch: 'p28186730_1394217_Generic.zip' +opatch_version: 13.9.4.2.17 +patch: 'p37087534_141100_Generic.zip' +patch_number: 37087534 +napply: False +patch_folder: '37087534' +java_archive_file: jdk-8u431-linux-x64.tar.gz +java_version_path: 'jdk1.8.0_431' From 049daa53f733919f5c71404ec6f84f9c87dc8e8a Mon Sep 17 00:00:00 2001 From: Martin Fanning Date: Fri, 18 Oct 2024 11:49:03 +0100 Subject: [PATCH 2/2] Update to Oracle 19.25.0.0.0 New Oracle 19.25.0.0.0 yaml file Update 19c molecule tests Update README Update Galaxy.yml --- galaxy.yml | 2 +- molecule/__oracle-v19c/converge.yml | 2 +- molecule/__oracle-v19c/verify.yml | 2 +- roles/oracle/README.md | 4 ++-- roles/oracle/defaults/main.yml | 2 +- roles/oracle/vars/v19.25.0.0.0.yml | 14 ++++++++++++++ 6 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 roles/oracle/vars/v19.25.0.0.0.yml diff --git a/galaxy.yml b/galaxy.yml index 1932086..f85c1a3 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.3 +version: 1.7.4 # 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/__oracle-v19c/converge.yml b/molecule/__oracle-v19c/converge.yml index d760043..d3dda54 100644 --- a/molecule/__oracle-v19c/converge.yml +++ b/molecule/__oracle-v19c/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - oracle_version: 19.24.0.0.0 + oracle_version: 19.25.0.0.0 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/__oracle-v19c/verify.yml b/molecule/__oracle-v19c/verify.yml index e73652a..a2ad9cd 100644 --- a/molecule/__oracle-v19c/verify.yml +++ b/molecule/__oracle-v19c/verify.yml @@ -6,7 +6,7 @@ vars: oracle_home: /opt/oracle/product/19c/dbhome_1 oracle_sid: orcl - oracle_version: 19.24.0.0.0 + oracle_version: 19.25.0.0.0 pre_tasks: - name: Check if DB exists diff --git a/roles/oracle/README.md b/roles/oracle/README.md index 2d24ea9..f97a66d 100644 --- a/roles/oracle/README.md +++ b/roles/oracle/README.md @@ -10,7 +10,7 @@ The `oracle` role will install Oracle Database EE Single Instance. | Property Name | Default value | | ------------------------- | --------------------------------------------------- | -| `oracle_version` | `19.24.0.0.0` | +| `oracle_version` | `19.25.0.0.0` | | `oracle_base` | `/opt/oracle` | | `oracle_home` | `/opt/oracle/product//dbhome_1` | | `oracle_inventory` | `/opt/Oracle/oraInventory` | @@ -42,7 +42,7 @@ None - hosts: servers roles: - role: merative.spm_middleware.oracle - oracle_version: 19.24.0.0.0 + oracle_version: 19.25.0.0.0 ## License diff --git a/roles/oracle/defaults/main.yml b/roles/oracle/defaults/main.yml index 34ed545..b450e66 100644 --- a/roles/oracle/defaults/main.yml +++ b/roles/oracle/defaults/main.yml @@ -7,7 +7,7 @@ travis_build: "{{ lookup('env', 'CI') }}" travis_flags: "{{'-force -ignoresysprereqs -ignoreprereq' if lookup('env', 'CI') is defined else ''}}" # Oracle config -oracle_version: 19.24.0.0.0 +oracle_version: 19.25.0.0.0 oracle_family: "{{ oracle_version.split('.') | first }}c" oracle_base: /opt/oracle oracle_home: "/opt/oracle/product/{{ oracle_family }}/dbhome_1" diff --git a/roles/oracle/vars/v19.25.0.0.0.yml b/roles/oracle/vars/v19.25.0.0.0.yml new file mode 100644 index 0000000..ea1492e --- /dev/null +++ b/roles/oracle/vars/v19.25.0.0.0.yml @@ -0,0 +1,14 @@ +--- +# prereq installers +prereqs_installer_7: https://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64/getPackage/oracle-database-preinstall-19c-1.0-1.el7.x86_64.rpm +prereqs_installer_8: https://yum.oracle.com/repo/OracleLinux/OL8/appstream/x86_64/getPackage/oracle-database-preinstall-19c-1.0-2.el8.x86_64.rpm +prereqs_installer: "{{ prereqs_installer_7 if ansible_distribution_major_version=='7' else prereqs_installer_8 }}" +# base installer values +base_version: 19.3.0.0.0 +base_installer: oracle-database-ee-19c-1.0-1.x86_64.rpm +# patch values +patch_filename: p36912597_190000_Linux-x86-64.zip +patch_number: 36912597 # used for directory +# Add OPatch values when bundled OPatch needs to be upgraded +opatch_filename: p6880880_190000_Linux-x86-64.zip +opatch_version: 12.2.0.1.44