Update PA-RCA to 2.x branch (#271)

Signed-off-by: Sruti Parthiban <partsrut@amazon.com> Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
opensearch-project · Sep 15, 2022 · c6a5838 · c6a5838
1 parent b4eb12b
commit c6a5838
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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=main -x javadoc
+          ./gradlew build buildDeb buildRpm --refresh-dependencies -Dbuild.snapshot=false -Dperformance-analyzer-rca.build=true -Dperformance-analyzer-rca.branch=2.x -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=main
+          -Dperformance-analyzer-rca.branch="2.x"
     - name: Assemble PA jar for BWC tests
       working-directory: ./tmp/performance-analyzer
       run: |

diff --git a/build.gradle b/build.gradle
@@ -63,10 +63,10 @@ spotbugsTest {
 }
 
 ext {
-    // The RCA branch that will be built. Default branch is main.
+    // 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}/main")
+    rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "${rcaProjectFetch}/2.x")
 
     // If true, then the build will clone the RCA Project into $rcaProjectDir
     cloneRcaProject = "true" == System.getProperty("performance-analyzer-rca.build", "true")
@@ -378,7 +378,7 @@ task cloneRcaGitRepo() {
     def destination = file(rcaProjectDir)
     def uri = rcaProjectRepo
     def fetch = rcaProjectFetch
-    def branch = rcaProjectBranch
+    def branch = rcaProjectFetch + "/" + rcaProjectBranch
     doFirst {
         println "Cloning performance-analyzer-rca into ${rcaProjectDir} from ${rcaProjectRepo}#${rcaProjectBranch}"
     }

diff --git a/licenses/performanceanalyzer-rca-2.4.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.4.0.0-SNAPSHOT.jar.sha1
@@ -1 +1 @@
-baca2e781951994ffb7c512e58d4445b16dcacc3
+ba37d6efa4d6802500e040ebd8c5535198244206