Skip to content

Commit ad689dc

Browse files
Merge branch 'ppc64le:master' into master
2 parents 4243562 + 583b2ff commit ad689dc

23 files changed

Lines changed: 1092 additions & 34 deletions

.github/workflows/currency-build.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,21 @@ jobs:
10161016
10171017
final_summary:
10181018
name: Final Summary Stage
1019-
needs: [build, source_scanner]
1019+
needs:
1020+
- build
1021+
- source_scanner
1022+
- wheel_build_py39
1023+
- wheel_build_py310
1024+
- wheel_build_py311
1025+
- wheel_build_py312
1026+
- wheel_build_py313
1027+
- wheel_build_py314
1028+
1029+
if: |
1030+
always() &&
1031+
needs.build.result == 'success' &&
1032+
needs.source_scanner.result == 'success'
1033+
10201034
runs-on: ubuntu-24.04-ppc64le-p10
10211035
steps:
10221036
- name: Checkout code

l/librt/librt_ubi_9.6.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,22 @@ PACKAGE_URL=https://github.com/mypyc/librt
2323
PACKAGE_VERSION=${1:-v0.8.1}
2424
PACKAGE_DIR=librt
2525

26-
dnf -y install git python3 python$3-pip python3-devel gcc-toolset-13
26+
dnf -y install git python3.12 python3.12-pip python3.12-devel gcc-toolset-13
2727

2828
# Enable GCC toolset
2929
source /opt/rh/gcc-toolset-13/enable
30-
export CXX=/opt/rh/gcc-toolset-13/root/usr/bin/g++
3130

3231
git clone ${PACKAGE_URL}
3332
cd ${PACKAGE_NAME}
3433
git checkout ${PACKAGE_VERSION}
3534

35+
#Needed to generate architecture specific wheel
36+
#Reference https://github.com/mypyc/librt/blob/master/.github/workflows/buildwheels.yml#L126
37+
cp -r lib-rt/* .
38+
rm -rf lib-rt
39+
3640
echo "building librt...."
37-
if ! python3 -m pip install --no-cache-dir .; then
41+
if ! python3 -m pip install .; then
3842
echo "------------------$PACKAGE_NAME: build_fail------------------"
3943
echo "$PACKAGE_NAME | $PACKAGE_URL | $PACKAGE_VERSION | GitHub | Fail | Build_Fail"
4044
exit 1

m/milvus-lite/milvus-lite_2.5.0_ubi_9.6.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@ yum install -y git gcc-c++ gcc wget make python3.12 yum-utils \
3232
libffi-devel scl-utils openblas-devel xz patch \
3333
python3.12-devel python3.12-pip
3434

35-
yum install -y gcc-toolset-13
36-
source /opt/rh/gcc-toolset-13/enable
35+
yum remove -y gcc-toolset-13 || true
3736
gcc --version
38-
echo "GCC Toolset 13 activated for milvus-lite build"
37+
echo "Using system GCC for milvus-lite build"
3938

4039
echo "Building OpenBLAS from source..."
4140
export MAX_JOBS=$(nproc)

n/numpy/numpy_v2.2.5_ubi_9.3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ git checkout v0.3.32
3737
git submodule update --init
3838

3939
make -j${MAX_JOBS} TARGET=POWER9 BUILD_BFLOAT16=1 BINARY=64 USE_OPENMP=1 USE_THREAD=1 NUM_THREADS=120 DYNAMIC_ARCH=1 INTERFACE64=0
40-
make install
40+
make install PREFIX=/usr/local
4141

4242
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib64:/usr/local/lib
4343

o/opensearch-project-alerting/build_info.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
"maintainer": "Prachi.Gaonkar@ibm.com",
33
"package_name": "opensearch-project-alerting",
44
"github_url": "https://github.com/opensearch-project/alerting",
5-
"version": "2.19.2.0",
6-
"required_versions":{"Releases": ["*"], "Tags": ["2.19.2.0"]},
5+
"version": "3.5.0.0",
6+
"required_versions":{"Releases": ["*"], "Tags": ["3.5.0.0"]},
77
"default_branch": "main",
88
"package_dir": "o/opensearch-project-alerting",
9-
"build_script": "opensearch-project-alerting_2.19.2.0_ubi_9.3.sh",
9+
"build_script":"opensearch-project-alerting_3.5.0.0_ubi_9.6.sh",
1010
"validate_build_script": true,
1111
"use_non_root_user": true,
1212
"docker_build": false,
13+
"3.5.0.0": {
14+
"build_script": "opensearch-project-alerting_3.5.0.0_ubi_9.6.sh"
15+
},
1316
"2.15.0.0": {
1417
"build_script": "opensearch-project-alerting_ubi_9.3.sh"
1518
},
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/build.gradle b/build.gradle
2+
index ca13dade..dc4d0584 100644
3+
--- a/build.gradle
4+
+++ b/build.gradle
5+
@@ -23,7 +23,7 @@ buildscript {
6+
}
7+
opensearch_no_snapshot = opensearch_version.replace("-SNAPSHOT","")
8+
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
9+
- kotlin_version = '2.2.0'
10+
+ kotlin_version = '2.2.20'
11+
}
12+
13+
repositories {
14+
diff --git a/gradle.properties b/gradle.properties
15+
new file mode 100644
16+
index 00000000..4d41702b
17+
--- /dev/null
18+
+++ b/gradle.properties
19+
@@ -0,0 +1,4 @@
20+
+org.gradle.native=false
21+
+
22+
+#Use plain console output (no rich formatting that requires native platform)
23+
+org.gradle.console=plain
24+
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
#!/bin/bash -e
2+
# --------------------------------------------------------------------------------
3+
# Package : alerting
4+
# --------------------------------------------------------------------------------
5+
# Version : 3.5.0.0
6+
# Source repo : https://github.com/opensearch-project/alerting
7+
# Tested on : UBI 9.6
8+
# Language : Java
9+
# Ci-Check : True
10+
# Script License : Apache License, Version 2 or later
11+
# Maintainer : Shubhada Salunkhe <Shubhada.salunkhe@ibm.com>
12+
#
13+
# Disclaimer : This script has been tested in root mode on given
14+
# ========== platform using the mentioned version of the package.
15+
# It may not work as expected with newer versions of the
16+
# package and/or distribution. In such case, please
17+
# contact "Maintainer" of this script.
18+
# --------------------------------------------------------------------------------
19+
20+
# ---------------------------
21+
# Configuration
22+
# ---------------------------
23+
PACKAGE_NAME="alerting"
24+
PACKAGE_ORG="opensearch-project"
25+
PACKAGE_VERSION="3.5.0.0"
26+
PACKAGE_URL="https://github.com/${PACKAGE_ORG}/${PACKAGE_NAME}.git"
27+
SCRIPT_PATH=$(dirname $(realpath $0))
28+
RUNTESTS=1
29+
BUILD_HOME="$(pwd)"
30+
31+
# -------------------
32+
# Parse CLI Arguments
33+
# -------------------
34+
for i in "$@"; do
35+
case $i in
36+
--skip-tests)
37+
RUNTESTS=0
38+
echo "Skipping tests"
39+
shift
40+
;;
41+
-*|--*)
42+
echo "Unknown option $i"
43+
exit 3
44+
;;
45+
*)
46+
PACKAGE_VERSION=$i
47+
echo "Building ${PACKAGE_NAME} ${PACKAGE_VERSION}"
48+
;;
49+
esac
50+
done
51+
52+
53+
# ---------------------------
54+
# Dependency Installation
55+
# ---------------------------
56+
sudo yum install -y git wget gcc gcc-c++ make cmake \
57+
python3 python3-devel \
58+
openssl-devel bzip2-devel zlib-devel \
59+
java-25-openjdk-devel
60+
61+
export JAVA_HOME=/usr/lib/jvm/java-25-openjdk
62+
export PATH=$JAVA_HOME/bin:$PATH
63+
64+
sudo chown -R test_user:test_user /home/tester
65+
66+
# ---------------------------
67+
# Clone and Prepare Repository
68+
# ---------------------------
69+
cd "${BUILD_HOME}"
70+
git clone "${PACKAGE_URL}"
71+
cd "${PACKAGE_NAME}"
72+
git checkout "${PACKAGE_VERSION}"
73+
74+
git apply ${SCRIPT_PATH}/${PACKAGE_ORG}-${PACKAGE_NAME}_${PACKAGE_VERSION}.patch
75+
76+
# --------
77+
# Build
78+
# --------
79+
ret=0
80+
./gradlew clean assemble || ret=$?
81+
if [ $ret -ne 0 ]; then
82+
set +ex
83+
echo "------------------ ${PACKAGE_NAME}: Build Failed ------------------"
84+
echo "$PACKAGE_NAME | $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub | Fail | Build_Fails"
85+
exit 1
86+
fi
87+
88+
export OPENSEARCH_ALERTING_ZIP=${BUILD_HOME}/${PACKAGE_NAME}/alerting/build/distributions/opensearch-alerting-3.5.0.0-SNAPSHOT.zip
89+
90+
# ---------------------------
91+
# Skip Tests?
92+
# ---------------------------
93+
if [ "$RUNTESTS" -eq 0 ]; then
94+
set +ex
95+
echo "------------------ Complete: Build successful! Tests skipped ------------------"
96+
exit 0
97+
fi
98+
99+
# ----------
100+
# Unit Test
101+
# ----------
102+
ret=0
103+
env -i PATH=/usr/bin:/bin JAVA_HOME=$JAVA_HOME ./gradlew test \
104+
-x :alerting:compileKotlin \
105+
-x :alerting:compileTestKotlin || ret=$?
106+
107+
if [ $ret -ne 0 ]; then
108+
set +ex
109+
echo "------------------ ${PACKAGE_NAME}: Unit Test Failed ------------------"
110+
echo "$PACKAGE_NAME | $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub | Fail | Unit_Test_Fails"
111+
exit 2
112+
fi
113+
114+
115+
# ---------------------------
116+
# Success
117+
# ---------------------------
118+
set +ex
119+
echo "Complete: Build and Tests successful!"
120+
echo "$PACKAGE_NAME | $PACKAGE_URL | $PACKAGE_VERSION | $OS_NAME | GitHub | Pass | Both_Install_and_Test_Success"
121+
echo "Plugin zip available at [${OPENSEARCH_ALERTING_ZIP}]"
122+

o/opensearch-project-cross-cluster-replication/build_info.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
"maintainer": "Prachi.Gaonkar@ibm.com",
33
"package_name": "opensearch-project-cross-cluster-replication",
44
"github_url": "https://github.com/opensearch-project/cross-cluster-replication",
5-
"version": "2.19.2.0",
6-
"required_versions":{"Releases": ["*"], "Tags": ["2.19.2.0"]},
5+
"version": "3.5.0.0",
6+
"required_versions":{"Releases": ["*"], "Tags": ["3.5.0.0"]},
77
"default_branch": "main",
88
"package_dir": "o/opensearch-project-cross-cluster-replication",
9-
"build_script": "opensearch-project-cross-cluster-replication_2.19.2.0_ubi_9.3.sh",
9+
"build_script": "opensearch-project-cross-cluster-replication_3.5.0.0_ubi_9.6.sh",
1010
"validate_build_script": true,
1111
"use_non_root_user": true,
1212
"docker_build": false,
13+
"3.5.0.0": {
14+
"build_script": "opensearch-project-cross-cluster-replication_3.5.0.0_ubi_9.6.sh"
15+
},
1316
"2.7.0.0": {
1417
"build_script": "opensearch-project-cross-cluster-replication_ubi_8.7.sh"
1518
},
@@ -19,4 +22,4 @@
1922
"2.15.0.0": {
2023
"build_script": "opensearch-project-cross-cluster-replication_ubi_9.3.sh"
2124
}
22-
}
25+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff --git a/build.gradle b/build.gradle
2+
index b1e1ac0..07d8af8 100644
3+
--- a/build.gradle
4+
+++ b/build.gradle
5+
@@ -54,7 +54,7 @@ buildscript {
6+
plugin_previous_version = opensearch_previous_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')
7+
8+
common_utils_version = System.getProperty("common_utils.version", opensearch_build)
9+
- kotlin_version = System.getProperty("kotlin.version", "2.2.0")
10+
+ kotlin_version = System.getProperty("kotlin.version", "2.2.20")
11+
12+
security_plugin_version = opensearch_build
13+
if (!isSnapshot) {
14+
diff --git a/gradle.properties b/gradle.properties
15+
new file mode 100644
16+
index 0000000..4d41702
17+
--- /dev/null
18+
+++ b/gradle.properties
19+
@@ -0,0 +1,4 @@
20+
+org.gradle.native=false
21+
+
22+
+#Use plain console output (no rich formatting that requires native platform)
23+
+org.gradle.console=plain
24+

0 commit comments

Comments
 (0)