[2.8] Updating the build.gradle and Install for the release (#477)

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
opensearch-project · Jun 1, 2023 · 89eeaa4 · 89eeaa4
1 parent ee2b73c
commit 89eeaa4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git 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.8 -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
@@ -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.8"
     - 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
@@ -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.8.0-SNAPSHOT/config/log4j2.xml
+  exec $OPENSEARCH_HOME/performance-analyzer-rca-2.8.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.8.0-SNAPSHOT/config/log4j2.xml
+  exec $OPENSEARCH_HOME/performance-analyzer-rca-2.8.0-SNAPSHOT/bin/performance-analyzer-rca &
 
   pid=$!
   PID_LOC=/tmp/performance-analyzer-agent

diff --git 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.8.0-SNAPSHOT -> 2.8.0.0-SNAPSHOT
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
         if (buildVersionQualifier) {
@@ -78,10 +78,10 @@ spotbugsTest {
 }
 
 ext {
-    // The RCA branch that will be built. Default branch is 2.x for 2.x branch.
+    // The RCA branch that will be built. Default branch is 2.8 for 2.8 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.8")
 
     // If true, then the build will clone the RCA Project into $rcaProjectDir
     cloneRcaProject = "true" == System.getProperty("performance-analyzer-rca.build", "true")