Update to OHS 12.2.1.4.240115 (#85)

* Update to OHS 12.2.1.4.240115

Update to OHS 12.2.1.4.240115
Use Java 1.8.0_411
Use latest OPatch version
Update molecule tests
Update galaxy.yml

* Update galaxy.yml

Update galaxy.yml following merging main into this branch

* Update WLS version to install as part of molecule test

Update WLS version to install as part of molecule test

* Update galaxy.yml

Update galaxy.yml

* Fix OPatch folder name

Fix OPatch folder name

* New Molecule test for OHS 12.2.1.4

New Molecule test for OHS 12.2.1.4
Revert changes made to OHS 12.2.1 test

* Update main.yml - remove old OHS test

Update main.yml - remove old OHS test

* Create 12.2.1.4 molecule test

Create 12.2.1.4 molecule test

* Add back in v12.2.1 test

Add back in v12.2.1 test

* remove 12.2.1 molecule test

remove 12.2.1 molecule test

* remove 12.2.1 test

remove 12.2.1 test

---------

Co-authored-by: Martin Fanning <[email protected]>

.github/workflows/main.yml

@@ -35,7 +35,7 @@ jobs:
           - oracle19c-rockylinux8
           - iim-191-rockylinux8
           - ihs-v90-rockylinux8
-          - ohs-v12.2.1-rockylinux8
+          - ohs-v12.2.1.4-rockylinux8
           - liberty-rockylinux8
           - liberty-jdk17-rockylinux8
           - liberty-jdk21-rockylinux8

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.6.1
+version: 1.6.2
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

molecule/__ohs-v12.2.1.4/converge.yml

@@ -0,0 +1,44 @@
+---
+- name: Converge
+  hosts: all
+
+  collections:
+    - merative.spm_middleware
+
+  tasks:
+    - name: Install python3
+      package:
+        name: python3
+        state: present
+
+    - name: Create symlink for python3
+      file:
+        src: /usr/bin/python3
+        dest: /usr/local/bin/python
+        owner: root
+        group: root
+        state: link
+
+    - name: pip self-update
+      pip:
+        name: pip
+        executable: pip3
+        state: latest
+      vars:
+        ansible_python_interpreter: /usr/bin/python3
+
+    - name: include weblogic
+      include_role:
+        name: weblogic
+      vars:
+        ansible_python_interpreter: /usr/bin/python3
+        weblogic_version: "14.1.1.0.240328"
+
+    - name: include ohs
+      include_role:
+        name: ohs
+      vars:
+        ansible_python_interpreter: /usr/bin/python3
+  vars:
+    download_url: "{{ lookup('env', 'ARTIFACTORY_URL') }}/{{ lookup('env', 'ARTIFACTORY_REPO') }}/SoftwareInstallers"
+    download_header: { 'X-JFrog-Art-Api': "{{ lookup('env', 'ARTIFACTORY_TOKEN') }}"}

molecule/__ohs-v12.2.1.4/verify.yml

@@ -0,0 +1,51 @@
+---
+- name: Verify
+  hosts: all
+
+  pre_tasks:
+    - name: include vars
+      include_vars: "../../roles/ohs/vars/v12.2.1.4.240115.yml"
+
+    - name: include default
+      include_vars: "../../roles/ohs/defaults/main.yml"
+
+    - name: Check opatch version
+      shell: "grep {{ opatch_version }} {{ ohs_home }}/OPatch/version.txt"
+      ignore_errors: True
+      register: opatch_version_flag
+      when: opatch_version is defined
+
+    - name: Check Shell File Exists
+      stat:
+        path: "{{ profiled_path }}/ohs.sh"
+      register: shell
+
+    - name: Check Profile File Exists
+      stat:
+        path: /opt/.profile
+      register: profile
+
+    - name: Check Domain Created
+      shell: "grep ohs_{{ ansible_hostname }} {{ ohs_home }}/domain-registry.xml"
+      ignore_errors: True
+      register: domain_created
+      when: opatch_version is defined
+
+  tasks:
+    - name: Check Patch Number Matched
+      assert:
+        that: opatch_version_flag.rc == 0
+      when: opatch_version is defined
+
+    - name: Check that shell exists
+      assert:
+        that: shell.stat.exists
+
+    - name: Check that profile exists
+      assert:
+        that: profile.stat.exists
+
+    - name: Check Domain Created
+      assert:
+        that: domain_created.rc == 0
+      when: opatch_version is defined

molecule/ohs-v12.2.1-rockylinux8/molecule.yml → molecule/ohs-v12.2.1.4-rockylinux8/molecule.yml

@@ -30,5 +30,5 @@ provisioner:
   env:
     ANSIBLE_FORCE_COLOR: 'true'
   playbooks:
-    converge: ../__ohs-v12.2.1/converge.yml
-    verify: ../__ohs-v12.2.1/verify.yml
+    converge: ../__ohs-v12.2.1.4/converge.yml
+    verify: ../__ohs-v12.2.1.4/verify.yml

roles/ohs/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # OHS config
-ohs_version: 12.2.1.4.210324
+ohs_version: 12.2.1.4.240115
 ohs_user: oracle
 ohs_admin_password: Password1
 ohs_group: oinstall

roles/ohs/vars/v12.2.1.4.240115.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"