diff --git a/galaxy.yml b/galaxy.yml index 3169077c..71f1a09d 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.3.0 +version: 1.3.1 # 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 6d5fc0a6..c5e3d78b 100644 --- a/molecule/__oracle-v19c/converge.yml +++ b/molecule/__oracle-v19c/converge.yml @@ -6,7 +6,7 @@ - merative.spm_middleware vars: - oracle_version: 19.14.0.0.0 + oracle_version: 19.20.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 90f11efe..e6d0baee 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.14.0.0.0 + oracle_version: 19.20.0.0.0 pre_tasks: - name: Check if DB exists diff --git a/roles/oracle/README.md b/roles/oracle/README.md index c3a6b64e..1ce8af07 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.11.0.0.0` | +| `oracle_version` | `19.20.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.11.0.0.0 + oracle_version: 19.20.0.0.0 ## License diff --git a/roles/oracle/defaults/main.yml b/roles/oracle/defaults/main.yml index e569a3ed..376480f8 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.11.0.0.0 +oracle_version: 19.20.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/tasks/patch.yml b/roles/oracle/tasks/patch.yml index 949814dd..919904cf 100644 --- a/roles/oracle/tasks/patch.yml +++ b/roles/oracle/tasks/patch.yml @@ -23,7 +23,7 @@ - name: "Check OPatch version matches {{ opatch_version }}" become: yes become_user: oracle - shell: "grep {{ opatch_version }} {{ oracle_home }}/OPatch/version.txt" + shell: "grep {{ opatch_version }} {{ oracle_home }}/OPatch/version.txt -jdk $ORACLE_HOME/jdk" ignore_errors: true register: opatch_status changed_when: False diff --git a/roles/oracle/vars/v19.11.0.0.0.yml b/roles/oracle/vars/v19.11.0.0.0.yml deleted file mode 100644 index 87455143..00000000 --- a/roles/oracle/vars/v19.11.0.0.0.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# 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: p33515361_190000_Linux-x86-64.zip -patch_number: 33515361 # 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.29 diff --git a/roles/oracle/vars/v19.14.0.0.0.yml b/roles/oracle/vars/v19.14.0.0.0.yml index 87455143..39bb764e 100644 --- a/roles/oracle/vars/v19.14.0.0.0.yml +++ b/roles/oracle/vars/v19.14.0.0.0.yml @@ -11,4 +11,4 @@ patch_filename: p33515361_190000_Linux-x86-64.zip patch_number: 33515361 # 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.29 +opatch_version: 12.2.0.1.39 diff --git a/roles/oracle/vars/v19.10.0.0.0.yml b/roles/oracle/vars/v19.20.0.0.0.yml similarity index 84% rename from roles/oracle/vars/v19.10.0.0.0.yml rename to roles/oracle/vars/v19.20.0.0.0.yml index 79a8e15b..f8a21f50 100644 --- a/roles/oracle/vars/v19.10.0.0.0.yml +++ b/roles/oracle/vars/v19.20.0.0.0.yml @@ -7,8 +7,8 @@ prereqs_installer: "{{ prereqs_installer_7 if ansible_distribution_major_version base_version: 19.3.0.0.0 base_installer: oracle-database-ee-19c-1.0-1.x86_64.rpm # patch values -patch_filename: p32218454_190000_Linux-x86-64.zip -patch_number: 32218454 # used for directory +patch_filename: p35320081_190000_Linux-x86-64.zip +patch_number: 35320081 # 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.29 +opatch_version: 12.2.0.1.39 diff --git a/roles/oracle/vars/v19.3.0.0.0.yml b/roles/oracle/vars/v19.3.0.0.0.yml deleted file mode 100644 index 31bbcbb9..00000000 --- a/roles/oracle/vars/v19.3.0.0.0.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# 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