From 098ccb531f444375dbd1c8ac6e0a11a45bbbe181 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Fri, 11 Jul 2025 11:00:14 +0530
Subject: [PATCH 01/21] Modified pandas_ubi_9.3.sh

---
 p/pandas/pandas_ubi_9.3.sh | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/p/pandas/pandas_ubi_9.3.sh b/p/pandas/pandas_ubi_9.3.sh
index 1b4a573085..285d55adac 100644
--- a/p/pandas/pandas_ubi_9.3.sh
+++ b/p/pandas/pandas_ubi_9.3.sh
@@ -16,40 +16,36 @@
 #             package and/or distribution. In such case, please
 #             contact "Maintainer" of this script.
 #
-# ----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 
 PACKAGE_NAME=pandas
-PACKAGE_VERSION=${1:-v2.2.0}
-PYTHON_VERSION=${2:-3.11}
+PACKAGE_VERSION=${1:-v2.3.0}
 PACKAGE_URL=https://github.com/pandas-dev/pandas.git
 
-yum install -y python${PYTHON_VERSION} python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip git gcc gcc-c++ cmake ninja-build openblas-devel  gcc-gfortran
+yum install -y python3.12 python3.12-devel python3.12-pip git gcc gcc-c++ cmake ninja-build openblas-devel gcc-gfortran
 
 git clone $PACKAGE_URL
 cd $PACKAGE_NAME/
 git checkout $PACKAGE_VERSION
 git submodule update --init --recursive
 
-# Setup virtual environment for python
-python${PYTHON_VERSION} -m venv pandas-env
-source pandas-env/bin/activate
-
-pip install --upgrade pip setuptools wheel
-pip install "numpy==2.0.2" "scipy>=1.8.0,<1.16.0"
-pip install cython meson-python ninja joblib threadpoolctl patchelf pytest build
+# Setup virtual environment for python3.12
+#python3.12 -m venv pandas-env
+#source pandas-env/bin/activate
 
+python3.12 -m pip install --upgrade pip setuptools wheel
+python3.12 -m pip install "numpy==2.0.2" "scipy>=1.8.0,<1.16.0"
+python3.12 -m pip install cython meson-python ninja joblib threadpoolctl patchelf pytest build
 
 # Optional install via setup (dev install)
-python${PYTHON_VERSION} -m pip install .
+python3.12 -m pip install .
 
 # Build the package and create whl file (This is dependent on cython)
-python${PYTHON_VERSION} -m build --wheel
-
+#python3.12 -m build --wheel
 
 # Test the package
 cd ..
-python${PYTHON_VERSION} -m pip show pandas
-python${PYTHON_VERSION} -c "import pandas; print(pandas.__file__)"
+python3.12 -c "import pandas; print(pandas.__file__)"
 
 if [ $? == 0 ]; then
      echo "------------------$PACKAGE_NAME::Test_Pass---------------------"
@@ -57,8 +53,7 @@ if [ $? == 0 ]; then
      echo "$PACKAGE_NAME  | $PACKAGE_URL | $PACKAGE_VERSION  | Pass |  Test_Success"
 
      # Deactivate python environment (pandas-env)
-         deactivate
-
+     deactivate
      exit 0
 else
      echo "------------------$PACKAGE_NAME::Test_Fail-------------------------"

From b6512e734a27d9a018c40548e974129468ac37de Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Fri, 11 Jul 2025 11:46:01 +0530
Subject: [PATCH 02/21] Update pandas_ubi_9.3.sh

---
 p/pandas/pandas_ubi_9.3.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/p/pandas/pandas_ubi_9.3.sh b/p/pandas/pandas_ubi_9.3.sh
index 285d55adac..f247cdd75f 100644
--- a/p/pandas/pandas_ubi_9.3.sh
+++ b/p/pandas/pandas_ubi_9.3.sh
@@ -53,7 +53,6 @@ if [ $? == 0 ]; then
      echo "$PACKAGE_NAME  | $PACKAGE_URL | $PACKAGE_VERSION  | Pass |  Test_Success"
 
      # Deactivate python environment (pandas-env)
-     deactivate
      exit 0
 else
      echo "------------------$PACKAGE_NAME::Test_Fail-------------------------"

From c9269227f39620a31f84110f5e1173542dc6a1d5 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Fri, 11 Jul 2025 15:18:22 +0530
Subject: [PATCH 03/21] added build_script for uvloop

---
 u/uvloop/LICENSE         | 201 +++++++++++++++++++++++++++++++++++++++
 u/uvloop/build_info.json |  16 ++++
 u/uvloop/uvloop_ubi_9.sh |  68 +++++++++++++
 3 files changed, 285 insertions(+)
 create mode 100644 u/uvloop/LICENSE
 create mode 100644 u/uvloop/build_info.json
 create mode 100644 u/uvloop/uvloop_ubi_9.sh

diff --git a/u/uvloop/LICENSE b/u/uvloop/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/u/uvloop/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/u/uvloop/build_info.json b/u/uvloop/build_info.json
new file mode 100644
index 0000000000..72a4eb4fcf
--- /dev/null
+++ b/u/uvloop/build_info.json
@@ -0,0 +1,16 @@
+{
+   "maintainer": "rusiyamanya",
+   "package_name": "uvloop",
+   "github_url": "https://github.com/MagicStack/uvloop",
+   "version": "v0.21.0",
+   "wheel_build" : true,
+   "default_branch": "master",
+   "build_script": "uvloop_ubi_9.sh",
+   "package_dir": "u/uvloop",
+   "docker_build": false,
+   "validate_build_script": true,
+   "use_non_root_user": false,
+  "v0.21.0": {
+    "build_script": "uvloop_ubi_9.sh"
+  }
+}
diff --git a/u/uvloop/uvloop_ubi_9.sh b/u/uvloop/uvloop_ubi_9.sh
new file mode 100644
index 0000000000..26f4223d29
--- /dev/null
+++ b/u/uvloop/uvloop_ubi_9.sh
@@ -0,0 +1,68 @@
+#!/bin/bash -e
+# -----------------------------------------------------------------------------
+#
+# Package       : uvloop
+# Version       : v0.21.0
+# Source repo   : https://github.com/MagicStack/uvloop
+# Tested on     : UBI 9
+# Language      : Python
+# Travis-Check  : True
+# Script License: Apache License 2.0
+# Maintainer    : Manya Rusiya <Manya.Rusiya@ibm.com>
+#
+# Disclaimer: This script has been tested in root mode on given
+# ==========  platform using the mentioned version of the package.
+#             It may not work as expected with newer versions of the
+#             package and/or distribution. In such case, please
+#             contact "Maintainer" of this script.
+#
+# -----------------------------------------------------------------------------
+
+PACKAGE_NAME=uvloop
+PACKAGE_VERSION=${1:-v0.21.0}
+PACKAGE_URL=https://github.com/MagicStack/uvloop
+PACKAGE_DIR=uvloop
+
+
+# Install dependencies
+yum install -y git python3.12 python3.12-devel python3.12-pip \
+    gcc gcc-c++ gzip tar make wget xz cmake yum-utils \
+    openssl-devel openblas-devel bzip2-devel bzip2 zip unzip libffi-devel \
+    zlib-devel autoconf automake libtool cargo \
+    pkgconf-pkg-config fontconfig fontconfig-devel sqlite-devel
+
+# Clone the repository
+git clone --recursive $PACKAGE_URL
+cd $PACKAGE_NAME
+git checkout $PACKAGE_VERSION
+git submodule update --init --recursive
+
+# Upgrade pip and install build/test dependencies
+python3.12 -m pip install --upgrade pip setuptools wheel
+python3.12 -m pip install meson meson-python ninja cython pythran "pybind11>=2.13.2"
+python3.12 -m pip install numpy==2.0.2 --no-build-isolation
+python3.12 -m pip install "scipy>=1.8.0,<1.16.0" --no-build-isolation
+python3.12 -m pip install joblib threadpoolctl patchelf pytest build hypothesis tox
+
+# ------------------ Install ------------------
+if ! (python3.12 -m pip install .); then
+    echo "------------------$PACKAGE_NAME:Install_fails-------------------------------------"
+    echo "$PACKAGE_URL $PACKAGE_NAME"
+    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | GitHub | Fail |  Install_Fails"
+    exit 1
+fi
+
+# ------------------ Test ------------------
+cd $PACKAGE_NAME
+
+if ! tox -e py312; then
+    echo "------------------$PACKAGE_NAME:Install_success_but_test_fails---------------------"
+    echo "$PACKAGE_URL $PACKAGE_NAME"
+    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | GitHub | Fail |  Install_success_but_test_Fails"
+    exit 2
+else
+    echo "------------------$PACKAGE_NAME:Install_&_test_both_success-------------------------"
+    echo "$PACKAGE_URL $PACKAGE_NAME"
+    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | GitHub | Pass |  Both_Install_and_Test_Success"
+    exit 0
+fi

From a955e9724b41a2e4e79d9895d208b77e5245accd Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Fri, 11 Jul 2025 15:39:46 +0530
Subject: [PATCH 04/21] Update uvloop_ubi_9.sh

---
 u/uvloop/uvloop_ubi_9.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/u/uvloop/uvloop_ubi_9.sh b/u/uvloop/uvloop_ubi_9.sh
index 26f4223d29..a6fab887f3 100644
--- a/u/uvloop/uvloop_ubi_9.sh
+++ b/u/uvloop/uvloop_ubi_9.sh
@@ -26,7 +26,7 @@ PACKAGE_DIR=uvloop
 
 # Install dependencies
 yum install -y git python3.12 python3.12-devel python3.12-pip \
-    gcc gcc-c++ gzip tar make wget xz cmake yum-utils \
+    gcc gcc-c++ gcc-gfortran gzip tar make wget xz cmake yum-utils \
     openssl-devel openblas-devel bzip2-devel bzip2 zip unzip libffi-devel \
     zlib-devel autoconf automake libtool cargo \
     pkgconf-pkg-config fontconfig fontconfig-devel sqlite-devel

From cd9c11e3b67cedd93f824e61bcc9346de03c222c Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Mon, 14 Jul 2025 10:51:56 +0530
Subject: [PATCH 05/21] Update build_info.json

---
 u/uvloop/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/u/uvloop/build_info.json b/u/uvloop/build_info.json
index 72a4eb4fcf..79b990fbde 100644
--- a/u/uvloop/build_info.json
+++ b/u/uvloop/build_info.json
@@ -10,7 +10,7 @@
    "docker_build": false,
    "validate_build_script": true,
    "use_non_root_user": false,
-  "v0.21.0": {
+  "*": {
     "build_script": "uvloop_ubi_9.sh"
   }
 }

From b4735820e53955c4e38096245ac9c565dd193868 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Mon, 14 Jul 2025 10:55:03 +0530
Subject: [PATCH 06/21] Update build_info.json

---
 u/uvloop/build_info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/u/uvloop/build_info.json b/u/uvloop/build_info.json
index 79b990fbde..e29590f27e 100644
--- a/u/uvloop/build_info.json
+++ b/u/uvloop/build_info.json
@@ -10,7 +10,7 @@
    "docker_build": false,
    "validate_build_script": true,
    "use_non_root_user": false,
-  "*": {
+   "*": {
     "build_script": "uvloop_ubi_9.sh"
   }
 }

From b571cce901e6afd28c8d5aa22016fd7cf75e425a Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Mon, 14 Jul 2025 12:06:45 +0530
Subject: [PATCH 07/21] Update build_info.json

---
 u/uvloop/build_info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/u/uvloop/build_info.json b/u/uvloop/build_info.json
index e29590f27e..936f2a59d9 100644
--- a/u/uvloop/build_info.json
+++ b/u/uvloop/build_info.json
@@ -5,12 +5,12 @@
    "version": "v0.21.0",
    "wheel_build" : true,
    "default_branch": "master",
-   "build_script": "uvloop_ubi_9.sh",
+   "build_script": "uvloop_ubi_9.3.sh",
    "package_dir": "u/uvloop",
    "docker_build": false,
    "validate_build_script": true,
    "use_non_root_user": false,
    "*": {
-    "build_script": "uvloop_ubi_9.sh"
+    "build_script": "uvloop_ubi_9.3.sh"
   }
 }

From dec1ba31694ceb02456c3185a20c93d071b2264a Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Mon, 14 Jul 2025 12:07:05 +0530
Subject: [PATCH 08/21] Update and rename uvloop_ubi_9.sh to uvloop_ubi_9.3.sh

---
 u/uvloop/{uvloop_ubi_9.sh => uvloop_ubi_9.3.sh} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename u/uvloop/{uvloop_ubi_9.sh => uvloop_ubi_9.3.sh} (99%)

diff --git a/u/uvloop/uvloop_ubi_9.sh b/u/uvloop/uvloop_ubi_9.3.sh
similarity index 99%
rename from u/uvloop/uvloop_ubi_9.sh
rename to u/uvloop/uvloop_ubi_9.3.sh
index a6fab887f3..4c769e965a 100644
--- a/u/uvloop/uvloop_ubi_9.sh
+++ b/u/uvloop/uvloop_ubi_9.3.sh
@@ -4,7 +4,7 @@
 # Package       : uvloop
 # Version       : v0.21.0
 # Source repo   : https://github.com/MagicStack/uvloop
-# Tested on     : UBI 9
+# Tested on     : UBI 9.3
 # Language      : Python
 # Travis-Check  : True
 # Script License: Apache License 2.0

From 4df650b2987b7ebf28f314b8c76096a6e40ac81a Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 14:35:23 +0530
Subject: [PATCH 09/21] observability_3.3.0.0 file add

---
 .../observability_3.3.0.0.patch               | 13 ++++
 ...h-project-observability_3.3.0.0_ubi_9.6.sh | 64 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 o/opensearch-project-observability/observability_3.3.0.0.patch
 create mode 100644 o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh

diff --git a/o/opensearch-project-observability/observability_3.3.0.0.patch b/o/opensearch-project-observability/observability_3.3.0.0.patch
new file mode 100644
index 0000000000..23a713e9d9
--- /dev/null
+++ b/o/opensearch-project-observability/observability_3.3.0.0.patch
@@ -0,0 +1,13 @@
+diff --git a/build.gradle b/build.gradle
+index 74f73276..6914abbf 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -22,7 +22,7 @@ buildscript {
+             opensearch_build += "-SNAPSHOT"
+         }
+         common_utils_version = System.getProperty("common_utils.version", opensearch_build)
+-        kotlin_version = System.getProperty("kotlin.version", "2.2.0")
++        kotlin_version = System.getProperty("kotlin.version", "2.2.20")
+     }
+ 
+     repositories {
diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
new file mode 100644
index 0000000000..9c38f0b2a7
--- /dev/null
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -0,0 +1,64 @@
+#!/bin/bash -e
+# -----------------------------------------------------------------------------
+#
+# Package          : observability
+# Version          : 3.3.0.0
+# Source repo      : https://github.com/opensearch-project/observability
+# Tested on        : UBI:9.6
+# Language         : Java
+# Ci-Check     : True
+# Script License   : Apache License, Version 2 or later
+# Maintainer       : Manya Rusiya <Manya.Rusiya@ibm.com>
+#
+# Disclaimer       : This script has been tested in non-root mode on given
+# ==========         platform using the mentioned version of the package.
+#                    It may not work as expected with newer versions of the
+#                    package and/or distribution. In such case, please
+#                    contact "Maintainer" of this script.
+#
+# ---------------------------------------------------------------------------
+
+PACKAGE_NAME=observability
+PACKAGE_URL=https://github.com/opensearch-project/observability
+PACKAGE_VERSION=${1:-3.3.0.0}
+BUILD_HOME="$(pwd)"
+SCRIPT=$(readlink -f $0)
+SCRIPT_DIR=$(dirname $SCRIPT)
+
+sudo yum install -y git java-21-openjdk-devel
+export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
+export PATH=$PATH:$JAVA_HOME/bin
+
+# ------------------------------
+# Build Opensearch common-utils
+# ------------------------------
+cd $BUILD_HOME
+git clone https://github.com/opensearch-project/common-utils.git
+cd common-utils
+git checkout $PACKAGE_VERSION
+./gradlew assemble
+./gradlew -Prelease=true publishToMavenLocal
+
+cd $BUILD_HOME
+git clone $PACKAGE_URL
+cd $PACKAGE_NAME
+git checkout $PACKAGE_VERSION
+git apply $SCRIPT_DIR/observability_3.3.0.0.patch
+
+if ! ./gradlew assemble ; then
+    echo "------------------$PACKAGE_NAME:Build_fails---------------------"
+    echo "$PACKAGE_URL $PACKAGE_NAME"
+    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub | Fail |  Build_Fails"
+    exit 1
+elif ! ./gradlew test; then
+    echo "------------------$PACKAGE_NAME::Test_fails-------------------------"
+    echo "$PACKAGE_URL $PACKAGE_NAME"
+    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub  | Fail|  Test_fails"
+    exit 2
+else
+    # If both the build and test are successful, print the success message
+    echo "------------------$PACKAGE_NAME:: Build_and_Test_success-------------------------"
+    echo "$PACKAGE_URL $PACKAGE_NAME"
+    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub  | Pass |  Both_Build_and_Test_Success"
+    exit 0
+fi

From 792190e9d15976fe64dd59c35b1aff10a4188583 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 14:49:23 +0530
Subject: [PATCH 10/21] modified build_info.json

---
 o/opensearch-project-observability/build_info.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/o/opensearch-project-observability/build_info.json b/o/opensearch-project-observability/build_info.json
index 4dcdc41357..aff7dfd055 100644
--- a/o/opensearch-project-observability/build_info.json
+++ b/o/opensearch-project-observability/build_info.json
@@ -2,14 +2,17 @@
   "maintainer": "Prachi.Gaonkar@ibm.com",
   "package_name": "opensearch-project-observability",
   "github_url": "https://github.com/opensearch-project/observability",
-  "version": "2.19.2.0",
-  "required_versions":{"Releases": ["*"], "Tags": ["2.19.2.0"]},
+  "version": "3.3.0.0",
+  "required_versions":{"Releases": ["*"], "Tags": ["3.3.0.0"]},
   "default_branch": "main",
   "package_dir": "o/opensearch-project-observability",
-  "build_script": "opensearch-project-observability_2.19.2.0_ubi_9.3.sh",
+  "build_script": "opensearch-project-observability_3.3.0.0_ubi_9.6.sh",
   "validate_build_script": true,
   "use_non_root_user": true,
   "docker_build": false,
+  "3.3.0.0": {
+    "build_script": "opensearch-project-observability_3.3.0.0_ubi_9.6.sh"
+  },
   "2.19.2.0": {
     "build_script": "opensearch-project-observability_2.19.2.0_ubi_9.3.sh"
   },

From 50640edd2111a6c98fba2d9e019c1a5f50bc5551 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 15:36:03 +0530
Subject: [PATCH 11/21] Enable debug mode in observability script

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 9c38f0b2a7..5015885049 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 # -----------------------------------------------------------------------------
 #
 # Package          : observability

From a4ffca5360266c2c0038fa7e6aee00648478b6bd Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 16:06:54 +0530
Subject: [PATCH 12/21] Install sudo for non-root user execution

Added installation of sudo for non-root user execution.
---
 ...pensearch-project-observability_3.3.0.0_ubi_9.6.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 5015885049..7898769efd 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -18,6 +18,17 @@
 #
 # ---------------------------------------------------------------------------
 
+# Install sudo for non-root user execution
+yum install sudo -y
+# ---------------------------
+# Check for root user
+# ---------------------------
+#if ! ((${EUID:-0} || "$(id -u)")); then
+#	set +ex
+#        echo "FAIL: This script must be run as a non-root user with sudo permissions"
+#        exit 3
+#fi
+
 PACKAGE_NAME=observability
 PACKAGE_URL=https://github.com/opensearch-project/observability
 PACKAGE_VERSION=${1:-3.3.0.0}

From 0793e63014de3c19ff7f4032e0185917aa625522 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 16:37:45 +0530
Subject: [PATCH 13/21] Disable sudo installation and root user validation

Comment out sudo installation and root user check.
---
 ...ensearch-project-observability_3.3.0.0_ubi_9.6.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 7898769efd..cabb624edf 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -19,15 +19,15 @@
 # ---------------------------------------------------------------------------
 
 # Install sudo for non-root user execution
-yum install sudo -y
+#yum install sudo -y
 # ---------------------------
 # Check for root user
 # ---------------------------
-#if ! ((${EUID:-0} || "$(id -u)")); then
-#	set +ex
-#        echo "FAIL: This script must be run as a non-root user with sudo permissions"
-#        exit 3
-#fi
+if ! ((${EUID:-0} || "$(id -u)")); then
+	set +ex
+        echo "FAIL: This script must be run as a non-root user with sudo permissions"
+        exit 3
+fi
 
 PACKAGE_NAME=observability
 PACKAGE_URL=https://github.com/opensearch-project/observability

From 6af6496bb1fefd7eb86829747e60c492e877304d Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 16:46:42 +0530
Subject: [PATCH 14/21] Use sudo for git clone commands in script

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index cabb624edf..776e01068a 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -44,14 +44,14 @@ export PATH=$PATH:$JAVA_HOME/bin
 # Build Opensearch common-utils
 # ------------------------------
 cd $BUILD_HOME
-git clone https://github.com/opensearch-project/common-utils.git
+sudo git clone https://github.com/opensearch-project/common-utils.git
 cd common-utils
 git checkout $PACKAGE_VERSION
 ./gradlew assemble
 ./gradlew -Prelease=true publishToMavenLocal
 
 cd $BUILD_HOME
-git clone $PACKAGE_URL
+sudo git clone $PACKAGE_URL
 cd $PACKAGE_NAME
 git checkout $PACKAGE_VERSION
 git apply $SCRIPT_DIR/observability_3.3.0.0.patch

From 21f59a7cf39d15b56d028901f08e096c62fc8539 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Wed, 7 Jan 2026 18:21:25 +0530
Subject: [PATCH 15/21] updated build_script

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 776e01068a..2dea3eb012 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -19,7 +19,7 @@
 # ---------------------------------------------------------------------------
 
 # Install sudo for non-root user execution
-#yum install sudo -y
+yum install sudo -y
 # ---------------------------
 # Check for root user
 # ---------------------------
@@ -44,7 +44,7 @@ export PATH=$PATH:$JAVA_HOME/bin
 # Build Opensearch common-utils
 # ------------------------------
 cd $BUILD_HOME
-sudo git clone https://github.com/opensearch-project/common-utils.git
+git clone https://github.com/opensearch-project/common-utils.git
 cd common-utils
 git checkout $PACKAGE_VERSION
 ./gradlew assemble

From a3666270a86b005ff27999794d7b588dcba8d684 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Thu, 8 Jan 2026 10:43:25 +0530
Subject: [PATCH 16/21] Comment out sudo installation in script

Comment out the installation of sudo in the script.
---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 2dea3eb012..67269c6b3e 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -19,7 +19,7 @@
 # ---------------------------------------------------------------------------
 
 # Install sudo for non-root user execution
-yum install sudo -y
+# yum install sudo -y
 # ---------------------------
 # Check for root user
 # ---------------------------

From 78d24305639f479b4264f32c13ba5209eeeee756 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Thu, 8 Jan 2026 11:30:35 +0530
Subject: [PATCH 17/21] Change gradlew command from assemble to build

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 67269c6b3e..6edfc58f16 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -56,7 +56,7 @@ cd $PACKAGE_NAME
 git checkout $PACKAGE_VERSION
 git apply $SCRIPT_DIR/observability_3.3.0.0.patch
 
-if ! ./gradlew assemble ; then
+if ! ./gradlew build ; then
     echo "------------------$PACKAGE_NAME:Build_fails---------------------"
     echo "$PACKAGE_URL $PACKAGE_NAME"
     echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub | Fail |  Build_Fails"

From a6fda132645bd9626f2a152abe7f89751e21f611 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Thu, 8 Jan 2026 11:45:49 +0530
Subject: [PATCH 18/21] Update git clone commands to use sudo where needed

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 6edfc58f16..1c24007e9b 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -44,14 +44,14 @@ export PATH=$PATH:$JAVA_HOME/bin
 # Build Opensearch common-utils
 # ------------------------------
 cd $BUILD_HOME
-git clone https://github.com/opensearch-project/common-utils.git
+sudo git clone https://github.com/opensearch-project/common-utils.git
 cd common-utils
 git checkout $PACKAGE_VERSION
 ./gradlew assemble
 ./gradlew -Prelease=true publishToMavenLocal
 
 cd $BUILD_HOME
-sudo git clone $PACKAGE_URL
+git clone $PACKAGE_URL
 cd $PACKAGE_NAME
 git checkout $PACKAGE_VERSION
 git apply $SCRIPT_DIR/observability_3.3.0.0.patch

From 6575d57479d8aca3b82e42afc6dcff1594c136f6 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Thu, 8 Jan 2026 11:53:50 +0530
Subject: [PATCH 19/21] Remove sudo from git clone command

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 1c24007e9b..5481f2405a 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -44,7 +44,7 @@ export PATH=$PATH:$JAVA_HOME/bin
 # Build Opensearch common-utils
 # ------------------------------
 cd $BUILD_HOME
-sudo git clone https://github.com/opensearch-project/common-utils.git
+git clone https://github.com/opensearch-project/common-utils.git
 cd common-utils
 git checkout $PACKAGE_VERSION
 ./gradlew assemble

From f3e0b22aad02bc7bec87e7432e4cd5965b2a8d31 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Thu, 15 Jan 2026 12:31:38 +0530
Subject: [PATCH 20/21] Refactor observability build script for better
 usability

Removed sudo requirement for non-root user execution and adjusted script to handle package version more effectively.
---
 ...h-project-observability_3.3.0.0_ubi_9.6.sh | 122 +++++++++++++-----
 1 file changed, 88 insertions(+), 34 deletions(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 5481f2405a..6b58afcb04 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 # -----------------------------------------------------------------------------
 #
 # Package          : observability
@@ -18,58 +18,112 @@
 #
 # ---------------------------------------------------------------------------
 
-# Install sudo for non-root user execution
-# yum install sudo -y
-# ---------------------------
-# Check for root user
-# ---------------------------
-if ! ((${EUID:-0} || "$(id -u)")); then
-	set +ex
-        echo "FAIL: This script must be run as a non-root user with sudo permissions"
-        exit 3
-fi
-
 PACKAGE_NAME=observability
 PACKAGE_URL=https://github.com/opensearch-project/observability
-PACKAGE_VERSION=${1:-3.3.0.0}
-BUILD_HOME="$(pwd)"
-SCRIPT=$(readlink -f $0)
-SCRIPT_DIR=$(dirname $SCRIPT)
+SCRIPT_PACKAGE_VERSION="3.3.0.0"
+PACKAGE_VERSION="${1:-$SCRIPT_PACKAGE_VERSION}"
+OPENSEARCH_VERSION="${PACKAGE_VERSION::-2}"
+OPENSEARCH_PACKAGE="OpenSearch"
+RUNTESTS=1
+wdir="$(pwd)"
+#SCRIPT=$(readlink -f $0)
+#SCRIPT_DIR=$(dirname $SCRIPT)
+
+# -------------------
+# Parse CLI Arguments
+# -------------------
+for i in "$@"; do
+  case $i in
+    --skip-tests)
+      RUNTESTS=0
+      echo "Skipping tests"
+      shift
+      ;;
+    -*|--*)
+      echo "Unknown option $i"
+      exit 3
+      ;;
+    *)
+      PACKAGE_VERSION=$i
+      echo "Building ${PACKAGE_NAME} ${PACKAGE_VERSION}"
+      ;;
+  esac
+done
+
+# ---------------------------
+# Dependency Installation
+# ---------------------------
 
 sudo yum install -y git java-21-openjdk-devel
 export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
 export PATH=$PATH:$JAVA_HOME/bin
 
+sudo chown -R test_user:test_user /home/tester
+
+#--------------------------------
+#Build opensearch-project and publish build tools 
+#-------------------------------
+cd $wdir
+git clone https://github.com/opensearch-project/OpenSearch.git
+cd OpenSearch
+git checkout $OPENSEARCH_VERSION
+./gradlew -p distribution/archives/linux-ppc64le-tar assemble
+./gradlew -Prelease=true publishToMavenLocal
+./gradlew :build-tools:publishToMavenLocal
+
+
 # ------------------------------
 # Build Opensearch common-utils
 # ------------------------------
-cd $BUILD_HOME
+cd $wdir
 git clone https://github.com/opensearch-project/common-utils.git
 cd common-utils
 git checkout $PACKAGE_VERSION
 ./gradlew assemble
 ./gradlew -Prelease=true publishToMavenLocal
 
-cd $BUILD_HOME
+# ---------------------------
+# Clone and Prepare Repository
+# ---------------------------
+
+cd $wdir
 git clone $PACKAGE_URL
 cd $PACKAGE_NAME
 git checkout $PACKAGE_VERSION
 git apply $SCRIPT_DIR/observability_3.3.0.0.patch
 
-if ! ./gradlew build ; then
-    echo "------------------$PACKAGE_NAME:Build_fails---------------------"
-    echo "$PACKAGE_URL $PACKAGE_NAME"
-    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub | Fail |  Build_Fails"
-    exit 1
-elif ! ./gradlew test; then
-    echo "------------------$PACKAGE_NAME::Test_fails-------------------------"
-    echo "$PACKAGE_URL $PACKAGE_NAME"
-    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub  | Fail|  Test_fails"
-    exit 2
-else
-    # If both the build and test are successful, print the success message
-    echo "------------------$PACKAGE_NAME:: Build_and_Test_success-------------------------"
-    echo "$PACKAGE_URL $PACKAGE_NAME"
-    echo "$PACKAGE_NAME  |  $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub  | Pass |  Both_Build_and_Test_Success"
-    exit 0
+
+# --------
+# Build
+# --------
+ret=0
+./gradlew build -Dbuild.snapshot=false || ret=$?
+if [ $ret -ne 0 ]; then
+        set +ex
+	echo "------------------ ${PACKAGE_NAME}: Build Failed ------------------"
+	exit 1
 fi
+
+# ---------------------------
+# Skip Tests?
+# ---------------------------
+if [ "$RUNTESTS" -eq 0 ]; then
+        set +ex
+        echo "------------------ Complete: Build successful! Tests skipped. ------------------"
+        exit 0
+fi
+
+
+# -----------------
+# Test
+# -----------------
+ret=0
+./gradlew test -Dbuild.snapshot=false || ret=$?
+if [ $ret -ne 0 ]; then
+	set +ex
+	echo "------------------ ${PACKAGE_NAME}: Integration Test Failed ------------------"
+	exit 2
+fi
+
+set +ex
+echo "Complete: Build and Tests successful!"

From 0452b7eaca0766124ab31764039e6e75476e4569 Mon Sep 17 00:00:00 2001
From: rusiyamanya <Manya.Rusiya@ibm.com>
Date: Thu, 15 Jan 2026 12:54:40 +0530
Subject: [PATCH 21/21] Update script to use dynamic patch file naming

---
 .../opensearch-project-observability_3.3.0.0_ubi_9.6.sh     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
index 6b58afcb04..35308ac064 100644
--- a/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
+++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh
@@ -26,8 +26,8 @@ OPENSEARCH_VERSION="${PACKAGE_VERSION::-2}"
 OPENSEARCH_PACKAGE="OpenSearch"
 RUNTESTS=1
 wdir="$(pwd)"
-#SCRIPT=$(readlink -f $0)
-#SCRIPT_DIR=$(dirname $SCRIPT)
+SCRIPT=$(readlink -f $0)
+SCRIPT_DIR=$(dirname $SCRIPT)
 
 # -------------------
 # Parse CLI Arguments
@@ -90,7 +90,7 @@ cd $wdir
 git clone $PACKAGE_URL
 cd $PACKAGE_NAME
 git checkout $PACKAGE_VERSION
-git apply $SCRIPT_DIR/observability_3.3.0.0.patch
+git apply $SCRIPT_DIR/${PACKAGE_NAME}_${PACKAGE_VERSION}.patch
 
 
 # --------