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" }, 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..35308ac064 --- /dev/null +++ b/o/opensearch-project-observability/opensearch-project-observability_3.3.0.0_ubi_9.6.sh @@ -0,0 +1,129 @@ +#!/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 +# +# 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 +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 $wdir +git clone https://github.com/opensearch-project/common-utils.git +cd common-utils +git checkout $PACKAGE_VERSION +./gradlew assemble +./gradlew -Prelease=true publishToMavenLocal + +# --------------------------- +# Clone and Prepare Repository +# --------------------------- + +cd $wdir +git clone $PACKAGE_URL +cd $PACKAGE_NAME +git checkout $PACKAGE_VERSION +git apply $SCRIPT_DIR/${PACKAGE_NAME}_${PACKAGE_VERSION}.patch + + +# -------- +# 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!"