Skip to content

Commit

Permalink
Update oracle 19c to latest patch (#61)
Browse files Browse the repository at this point in the history
* update to latest Oracle patch

* update versions

* fix opatch version

* update galaxy version

* update opatch version

* Remove older versions for ORA db

* merge change

* fix path

* test

* test

* correct version

* remove commented out code

* remove unmerged code
  • Loading branch information
ourboy authored Oct 9, 2023
1 parent d6dcde3 commit a4e9078
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 33 deletions.
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion molecule/__oracle-v19c/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"}

Expand Down
2 changes: 1 addition & 1 deletion molecule/__oracle-v19c/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions roles/oracle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/<oracle_family>/dbhome_1` |
| `oracle_inventory` | `/opt/Oracle/oraInventory` |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/oracle/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion roles/oracle/tasks/patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions roles/oracle/vars/v19.11.0.0.0.yml

This file was deleted.

2 changes: 1 addition & 1 deletion roles/oracle/vars/v19.14.0.0.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions roles/oracle/vars/v19.3.0.0.0.yml

This file was deleted.

0 comments on commit a4e9078

Please sign in to comment.