From 22a09068cfe45d780435ab366c5361f68e14f56d Mon Sep 17 00:00:00 2001 From: Khushboo Rajput <59671881+khushbr@users.noreply.github.com> Date: Tue, 5 Sep 2023 18:56:05 -0700 Subject: [PATCH] Add changes for release v2.10 (#528) Signed-off-by: Khushboo Rajput --- .github/workflows/cd.yml | 2 +- .github/workflows/gradle.yml | 10 +++++----- bin/performance-analyzer-agent | 10 +++++----- build.gradle | 4 ++-- licenses/bcprov-jdk15to18-1.75.jar.sha1 | 1 + ...earch-performance-analyzer.release-notes-2.4.0.0.md | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 licenses/bcprov-jdk15to18-1.75.jar.sha1 diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1403f130..29a99afb 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -21,7 +21,7 @@ jobs: - name: Build Artifacts working-directory: ./tmp/pa run: | - ./gradlew build buildDeb buildRpm --refresh-dependencies -Dbuild.snapshot=false -Dperformance-analyzer-rca.build=true -Dperformance-analyzer-rca.branch=2.x -x javadoc + ./gradlew build buildDeb buildRpm --refresh-dependencies -Dbuild.snapshot=false -Dperformance-analyzer-rca.build=true -Dperformance-analyzer-rca.branch=2.10 -x javadoc mkdir artifacts artifact=`ls build/distributions/*.zip` rpm_artifact=`ls build/distributions/*.rpm` diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a426d86b..83883ced 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,11 +1,11 @@ name: Java CI -on: - push: - branches: +on: + push: + branches: - "*" pull_request: - branches: + branches: - "*" jobs: @@ -40,7 +40,7 @@ jobs: run: | ./gradlew build -Dperformance-analyzer-rca.build=true \ -Dperformance-analyzer-rca.repo="https://github.com/opensearch-project/performance-analyzer-rca.git" \ - -Dperformance-analyzer-rca.branch="2.x" + -Dperformance-analyzer-rca.branch="2.10" - name: Assemble PA jar for BWC tests working-directory: ./tmp/performance-analyzer run: | diff --git a/bin/performance-analyzer-agent b/bin/performance-analyzer-agent index f3d375cd..bb57b730 100755 --- a/bin/performance-analyzer-agent +++ b/bin/performance-analyzer-agent @@ -20,7 +20,7 @@ elif [ ! -z "$OPENSEARCH_JAVA_HOME" ]; then # Use OPENSEARCH_JAVA_HOME if present JAVA_HOME=$OPENSEARCH_JAVA_HOME elif [ -z "$JAVA_HOME" ]; then - # Nor OPENSEARCH_JAVA_HOME nor JAVA_HOME is present, failing + # Nor OPENSEARCH_JAVA_HOME nor JAVA_HOME is present, failing echo "OPENSEARCH_JAVA_HOME / JAVA_HOME needs to be set or passed in as the second parameter." exit 1 fi @@ -34,12 +34,12 @@ export JAVA_HOME=$JAVA_HOME # We need to change this file: https://github.com/opensearch-project/opensearch-build/blob/main/release/docker/config/opensearch/opensearch-docker-entrypoint.sh if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' >/dev/null; then - export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-3.0.0-SNAPSHOT/config/log4j2.xml - exec $OPENSEARCH_HOME/performance-analyzer-rca-3.0.0-SNAPSHOT/bin/performance-analyzer-rca + export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-2.10.0-SNAPSHOT/config/log4j2.xml + exec $OPENSEARCH_HOME/performance-analyzer-rca-2.10.0-SNAPSHOT/bin/performance-analyzer-rca else echo 'Starting deamon' - export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-3.0.0-SNAPSHOT/config/log4j2.xml - exec $OPENSEARCH_HOME/performance-analyzer-rca-3.0.0-SNAPSHOT/bin/performance-analyzer-rca & + export JAVA_OPTS=-Dopensearch.path.home=$OPENSEARCH_HOME\ -Dlog4j.configurationFile=$OPENSEARCH_HOME/performance-analyzer-rca-2.10.0-SNAPSHOT/config/log4j2.xml + exec $OPENSEARCH_HOME/performance-analyzer-rca-2.10.0-SNAPSHOT/bin/performance-analyzer-rca & pid=$! PID_LOC=/tmp/performance-analyzer-agent diff --git a/build.gradle b/build.gradle index 053adba0..bd1c6a41 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { // is a library dependency with hardcoded versioning in PA and RCA repos. paCommonsVersion = "1.0.0" - // 3.0.0-SNAPSHOT -> 3.0.0.0-SNAPSHOT + // 2.10.0-SNAPSHOT -> 2.10.0.0-SNAPSHOT version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' if (buildVersionQualifier) { @@ -81,7 +81,7 @@ ext { // The RCA branch that will be built. Default branch is 2.x for 2.x branch. rcaProjectRepo = System.getProperty("performance-analyzer-rca.repo", "https://github.com/opensearch-project/performance-analyzer-rca.git") rcaProjectFetch = System.getProperty("performance-analyzer-rca.fetch", "origin") - rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "${rcaProjectFetch}/2.x") + rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "${rcaProjectFetch}/2.10") // If true, then the build will clone the RCA Project into $rcaProjectDir cloneRcaProject = "true" == System.getProperty("performance-analyzer-rca.build", "true") diff --git a/licenses/bcprov-jdk15to18-1.75.jar.sha1 b/licenses/bcprov-jdk15to18-1.75.jar.sha1 new file mode 100644 index 00000000..9911bb75 --- /dev/null +++ b/licenses/bcprov-jdk15to18-1.75.jar.sha1 @@ -0,0 +1 @@ +df22e1b6a9f6b218913f5b68dd16641344397fe0 \ No newline at end of file diff --git a/release-notes/opensearch-performance-analyzer.release-notes-2.4.0.0.md b/release-notes/opensearch-performance-analyzer.release-notes-2.4.0.0.md index 3ae2df9a..cf04742a 100644 --- a/release-notes/opensearch-performance-analyzer.release-notes-2.4.0.0.md +++ b/release-notes/opensearch-performance-analyzer.release-notes-2.4.0.0.md @@ -10,4 +10,4 @@ Compatible with OpenSearch 2.4.0 * Update jackson to 2.13.4 ([#293](https://github.com/opensearch-project/performance-analyzer/pull/293)) * Add group = org.opensearch.plugin ([#304](https://github.com/opensearch-project/performance-analyzer/pull/304)) ([#305](https://github.com/opensearch-project/performance-analyzer/pull/305)) * Address CVE-2022-42003 ([#312](https://github.com/opensearch-project/performance-analyzer/pull/312)) -* Deprecate master nomenclature in 2.x ([#319](https://github.com/opensearch-project/performance-analyzer/pull/319)) +* Deprecate master nomenclature in 2.4 ([#319](https://github.com/opensearch-project/performance-analyzer/pull/319))