From 098ccb531f444375dbd1c8ac6e0a11a45bbbe181 Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Fri, 11 Jul 2025 11:00:14 +0530 Subject: [PATCH 01/10] 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 Date: Fri, 11 Jul 2025 11:46:01 +0530 Subject: [PATCH 02/10] 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 Date: Fri, 11 Jul 2025 15:18:22 +0530 Subject: [PATCH 03/10] 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 +# +# 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 Date: Fri, 11 Jul 2025 15:39:46 +0530 Subject: [PATCH 04/10] 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 Date: Mon, 14 Jul 2025 10:51:56 +0530 Subject: [PATCH 05/10] 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 Date: Mon, 14 Jul 2025 10:55:03 +0530 Subject: [PATCH 06/10] 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 Date: Mon, 14 Jul 2025 12:06:45 +0530 Subject: [PATCH 07/10] 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 Date: Mon, 14 Jul 2025 12:07:05 +0530 Subject: [PATCH 08/10] 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 dd6c36946c2a3f70f581232275eea216f5dd692a Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Tue, 10 Feb 2026 12:47:08 +0530 Subject: [PATCH 09/10] added build_script for security --- .../common-utils_3.3.0.0.patch | 24 ++++++ .../opensearch-project-security_3.3.0.0.patch | 85 +++++++------------ .../security_3.3.0.0_ubi9.6.sh | 17 +++- 3 files changed, 70 insertions(+), 56 deletions(-) create mode 100644 o/opensearch-project-security/common-utils_3.3.0.0.patch diff --git a/o/opensearch-project-security/common-utils_3.3.0.0.patch b/o/opensearch-project-security/common-utils_3.3.0.0.patch new file mode 100644 index 0000000000..55f45882f1 --- /dev/null +++ b/o/opensearch-project-security/common-utils_3.3.0.0.patch @@ -0,0 +1,24 @@ +diff --git a/build.gradle b/build.gradle +index 66e29ed..dc35bd4 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -16,8 +16,7 @@ buildscript { + mavenLocal() + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } +- maven { url "https://central.sonatype.com/repository/maven-snapshots/" } +- maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } ++ maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + } + + dependencies { +@@ -38,8 +37,7 @@ repositories { + mavenLocal() + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } +- maven { url "https://central.sonatype.com/repository/maven-snapshots/" } +- maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } ++ maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + } + + allprojects { diff --git a/o/opensearch-project-security/opensearch-project-security_3.3.0.0.patch b/o/opensearch-project-security/opensearch-project-security_3.3.0.0.patch index bcc65ff353..524509c3c9 100644 --- a/o/opensearch-project-security/opensearch-project-security_3.3.0.0.patch +++ b/o/opensearch-project-security/opensearch-project-security_3.3.0.0.patch @@ -1,44 +1,45 @@ diff --git a/build.gradle b/build.gradle -index e9efe3f1..d88032c4 100644 +index e9efe3f1..cc3ba917 100644 --- a/build.gradle +++ b/build.gradle -@@ -16,7 +16,7 @@ import groovy.json.JsonBuilder - - buildscript { - ext { -- opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT") -+ opensearch_version = System.getProperty("opensearch.version", "3.3.0") - isSnapshot = "true" == System.getProperty("build.snapshot", "true") - buildVersionQualifier = System.getProperty("build.version_qualifier", "") - -@@ -24,7 +24,7 @@ buildscript { - version_tokens = opensearch_version.tokenize('-') - opensearch_build = version_tokens[0] + '.0' - -- common_utils_version = System.getProperty("common_utils.version", '3.2.0.0-SNAPSHOT') -+ common_utils_version = System.getProperty("common_utils.version", '3.2.0.0') - - kafka_version = '4.0.0' - open_saml_version = '5.1.6' -@@ -39,7 +39,7 @@ buildscript { - opensearch_build += "-${buildVersionQualifier}" - } - if (isSnapshot) { -- opensearch_build += "-SNAPSHOT" -+ opensearch_build += "" - } +@@ -47,8 +47,7 @@ buildscript { + mavenLocal() + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } +- maven { url "https://central.sonatype.com/repository/maven-snapshots/" } +- maven { url "https://artifacts.opensearch.org/snapshots/lucene/" } ++ maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + maven { url "https://build.shibboleth.net/nexus/content/groups/public" } } -@@ -494,6 +494,8 @@ configurations { +@@ -422,7 +421,7 @@ publishing { + repositories { + maven { + name = "Snapshots" // optional target repository name +- url = "https://central.sonatype.com/repository/maven-snapshots/" ++ url = "https://ci.opensearch.org/ci/dbc/snapshots/maven/" + credentials { + username System.getenv("SONATYPE_USERNAME") + password System.getenv("SONATYPE_PASSWORD") +@@ -494,6 +493,7 @@ configurations { // For org.opensearch.plugin:transport-grpc force "com.google.guava:failureaccess:1.0.3" -+ + exclude group: "org.lz4", module: "lz4-java" } } -@@ -711,7 +713,7 @@ dependencies { +@@ -506,8 +506,7 @@ allprojects { + mavenLocal() + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } +- maven { url "https://central.sonatype.com/repository/maven-snapshots/" } +- maven { url "https://artifacts.opensearch.org/snapshots/lucene/" } ++ maven { url "https://ci.opensearch.org/ci/dbc/snapshots/maven/" } + maven { url "https://build.shibboleth.net/nexus/content/repositories/releases" } + maven { url "build.shibboleth.net/maven/releases"} + } +@@ -711,7 +710,7 @@ dependencies { runtimeOnly "org.glassfish.jaxb:jaxb-runtime:${jaxb_version}" runtimeOnly 'com.google.j2objc:j2objc-annotations:3.1' compileOnly 'com.google.code.findbugs:jsr305:3.0.2' @@ -47,29 +48,3 @@ index e9efe3f1..d88032c4 100644 runtimeOnly 'org.slf4j:slf4j-api:1.7.36' runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" runtimeOnly 'org.xerial.snappy:snappy-java:1.1.10.8' -@@ -893,7 +895,7 @@ afterEvaluate { - ospackage { - packageName = "${name}" - release = isSnapshot ? "0.1" : '1' -- version = "${project.version}" - "-SNAPSHOT" -+ version = "${project.version}" - - into '/usr/share/opensearch/plugins' - from(zipTree(bundlePlugin.archivePath)) { -@@ -955,7 +957,7 @@ task updateVersion { - doLast { - ext.newVersion = System.getProperty('newVersion') - println "Setting version to ${newVersion}." -- // String tokenization to support -SNAPSHOT -+ // String tokenization to support - ant.replaceregexp(match: opensearch_version.tokenize('-')[0], replace: newVersion.tokenize('-')[0], flags:'g', byline:true) { - fileset(dir: projectDir) { - // Include the required files that needs to be updated with new Version -@@ -963,6 +965,6 @@ task updateVersion { - include(name: ".github/workflows/plugin_install.yml") - } - } -- ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true) -+ ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0], flags:'g', byline:true) - } - } diff --git a/o/opensearch-project-security/security_3.3.0.0_ubi9.6.sh b/o/opensearch-project-security/security_3.3.0.0_ubi9.6.sh index 9f383402fa..7376815b4e 100755 --- a/o/opensearch-project-security/security_3.3.0.0_ubi9.6.sh +++ b/o/opensearch-project-security/security_3.3.0.0_ubi9.6.sh @@ -22,6 +22,7 @@ PACKAGE_ORG="opensearch-project" PACKAGE_VERSION="3.3.0.0" COMMON_UTILS_VERSION="3.2.0.0" PACKAGE_URL="https://github.com/${PACKAGE_ORG}/${PACKAGE_NAME}.git" +OPENSEARCH_VERSION="${PACKAGE_VERSION::-2}" SCRIPT_PATH=$(dirname $(realpath $0)) RUNTESTS=1 BUILD_HOME="$(pwd)" @@ -59,6 +60,18 @@ export PATH=$PATH:/usr/local/jdk-21.0.9+10/bin/ ln -sf /usr/local/jdk-21.0.9+10/bin/java /usr/bin/ rm -rf OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.9_10.tar.gz +#-------------------------------- +#Build opensearch-project and publish build tools +#------------------------------- +cd ${BUILD_HOME} +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 # ------------------------------ @@ -66,6 +79,7 @@ cd ${BUILD_HOME} git clone https://github.com/opensearch-project/common-utils.git cd common-utils git checkout "${COMMON_UTILS_VERSION}" +git apply ${SCRIPT_PATH}/common-utils_${PACKAGE_VERSION}.patch ./gradlew assemble ./gradlew -Prelease=true publishToMavenLocal @@ -88,8 +102,9 @@ if [ $ret -ne 0 ]; then echo "------------------ ${PACKAGE_NAME}: Build Failed ------------------" exit 1 fi -export OPENSEARCH_SECURITY_ZIP=${BUILD_HOME}/${PACKAGE_NAME}/build/distributions/opensearch-security-${PACKAGE_VERSION}.zip +export OPENSEARCH_SECURITY_ZIP=${BUILD_HOME}/${PACKAGE_NAME}/build/distributions/opensearch-security-${PACKAGE_VERSION}-SNAPSHOT.zip +# test might not pass as its flaky # --------------------------- # Skip Tests? # --------------------------- From 5acd40200daec0f8e27dcc5932f5d1710455849a Mon Sep 17 00:00:00 2001 From: rusiyamanya Date: Tue, 10 Feb 2026 15:18:28 +0530 Subject: [PATCH 10/10] Update security_3.3.0.0_ubi9.6.sh