Change main to 1.2 (#84)

* Change main to 1.2 Signed-off-by: Karishma Joseph <[email protected]> * Fix broken build and remove deb rpm files (#85) Signed-off-by: Sruti Parthiban <[email protected]> Co-authored-by: Sruti Parthiban <[email protected]>
opensearch-project · Nov 9, 2021 · 093aa36 · 093aa36
1 parent 75dc06e
commit 093aa36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -34,7 +34,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=1.2 \
           -Dopensearch.version=1.2.0-SNAPSHOT
     - name: Assemble PA jar for BWC tests
       working-directory: ./tmp/performance-analyzer

diff --git a/build.gradle b/build.gradle
@@ -74,7 +74,7 @@ ext {
 
     // The RCA branch that will be built. Default branch is main.
     rcaProjectRepo = System.getProperty("performance-analyzer-rca.repo", "https://github.com/opensearch-project/performance-analyzer-rca.git")
-    rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "main")
+    rcaProjectBranch = System.getProperty("performance-analyzer-rca.branch", "1.2")
 
     // If true, then the build will clone the RCA Project into $rcaProjectDir
     cloneRcaProject = "true" == System.getProperty("performance-analyzer-rca.build", "true")
@@ -83,10 +83,12 @@ ext {
     rcaProjectDir = System.getProperty("performance-analyzer-rca.path", "../performance-analyzer-rca")
 }
 
-group = "org.opensearch"
-version = opensearch_version - '-SNAPSHOT' + '.0'
-if (isSnapshot) {
-    version += "-SNAPSHOT"
+allprojects {
+    group = "org.opensearch"
+    version = opensearch_version - '-SNAPSHOT' + '.0'
+    if (isSnapshot) {
+        version += "-SNAPSHOT"
+    }
 }
 
 apply plugin: 'opensearch.opensearchplugin'
@@ -397,10 +399,6 @@ bundlePlugin {
         include "performance-analyzer-agent-cli"
         into "bin"
     }
-    from("packaging") {
-        include "deb/**", "rpm/**"
-        into "install"
-    }
     from('build/resources/main/') {
         include "plugin-security.policy"
     }
@@ -615,7 +613,7 @@ afterEvaluate {
     ospackage {
         packageName = "opensearch-performance-analyzer"
         release = isSnapshot ? "0.1" : '1'
-        version = "${version}" - "-SNAPSHOT"
+        version = "${project.version}" - "-SNAPSHOT"
 
         into '/usr/share/opensearch/plugins'
         from(zipTree(bundlePlugin.archivePath)) {
@@ -639,7 +637,7 @@ afterEvaluate {
         fileMode 0644
         dirMode 0755
 
-        requires('opensearch', versions.opensearch, EQUAL)
+        requires('opensearch-oss', versions.opensearch, EQUAL)
         packager = 'Amazon'
         vendor = 'Amazon'
         os = 'LINUX'