Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change main to 1.2 #84

Merged
merged 2 commits into from
Nov 9, 2021
Merged

Change main to 1.2 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe9900
Change main to 1.2
kjoseph07 Nov 8, 2021
3cd0059
Fix broken build and remove deb rpm files (#85)
sruti1312 Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 9 additions & 11 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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'
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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)) {
Expand All @@ -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'
Expand Down