Skip to content

Commit

Permalink
Update version from 1.0.0.0-rc1 to 1.0.0.0 (#24)
Browse files Browse the repository at this point in the history
Signed-off-by: Sruti Parthiban <partsrut@amazon.com>
  • Loading branch information
sruti1312 authored Jul 1, 2021
1 parent 8679c2b commit 31eb00e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Java CI
on:
push:
branches:
- main
- "*"

pull_request:
branches:
- main
- "*"

jobs:
build_rca_pkg:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
run: ./gradlew publishToMavenLocal
- name: Build PA gradle using the new RCA jar
working-directory: ./tmp/pa
run: rm -f licenses/performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1
run: rm -f licenses/performanceanalyzer-rca-1.0.0.0.jar.sha1
# PA depends on OpenSearch. Checkout and publish to maven local for PA build.
- name: Checkout OpenSearch
uses: actions/checkout@v2
Expand All @@ -62,7 +62,7 @@ jobs:
ref: '1.0'
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false
run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
- name: Update SHA
working-directory: ./tmp/pa
run: ./gradlew updateShas
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ This package uses the [Gradle](https://docs.gradle.org/current/userguide/usergui

4. Because we are supplying our own version of the RCA framework, the SHA might have changed. So, delete the old SHA file if it exists. The SHA will get updated during build time.

`rm -f licenses/performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1`
`rm -f licenses/performanceanalyzer-rca-1.0.0.0.jar.sha1`

5. Trigger a gradle build. This builds the plugin, runs unit tests and creates the plugin jar.

Expand Down Expand Up @@ -106,7 +106,7 @@ You can use the packaged Dockerfile and docker-compose.yml files [here](./docker
4. Copy the RCA framework artifact and the Performance Analyzer plugin JAR into this folder

`cp <RCA framework root>/build/distributions/performance-analyzer-rca.zip ./`
`cp <Performance Analyzer plugin root>/build/distributions/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip ./`
`cp <Performance Analyzer plugin root>/build/distributions/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip ./`

### Installation

Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ publishing {
maven(MavenPublication) {
groupId = 'org.opensearch'
artifactId = 'performanceanalyzer-rca'
version = '1.0.0.0-rc1'
version = '1.0.0.0'
from components.java
}
}
Expand Down Expand Up @@ -209,7 +209,7 @@ jacocoTestCoverageVerification {
check.dependsOn jacocoTestCoverageVerification


version = "${rca_version}.0.0-rc1"
version = "${rca_version}.0.0"
if (isSnapshot) {
version += "-SNAPSHOT"
}
Expand Down Expand Up @@ -376,7 +376,7 @@ task cloneGitRepo(type: GitClone) {

task removeLicenses(type: Delete) {
dependsOn(cloneGitRepo)
def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0-rc1.jar.sha1')
def toDelete = Paths.get(paDir, 'licenses', 'performanceanalyzer-rca-1.0.0.0.jar.sha1')
delete(toDelete)
}

Expand All @@ -399,7 +399,7 @@ task copyAllArtifacts(type: Copy) {
def projectPathStr = getProjectDir().toPath().toString()
def dockerArtifacts = Paths.get(projectPathStr, 'docker').toString()
def rcaArtifacts = Paths.get(projectPathStr, 'build', 'distributions', 'performance-analyzer-rca.zip')
def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip')
def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip')

dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker')
from(dockerArtifacts)
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ COPY --chown=1000:0 opensearch.yml log4j2.properties config/

COPY --chown=1000:0 performance-analyzer-rca.zip config/

COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip /tmp/
COPY --chown=1000:0 opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip /tmp/

RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip; \
rm /tmp/opensearch-performance-analyzer-1.0.0.0-rc1-SNAPSHOT.zip
RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip; \
rm /tmp/opensearch-performance-analyzer-1.0.0.0-SNAPSHOT.zip

USER 0

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/plugin-descriptor.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
description=Performance Analyzer Plugin
#
# 'version': plugin's version
version=1.0.0.0-rc1
version=1.0.0.0
#
# 'name': the plugin name
name=performance-analyzer
Expand All @@ -42,4 +42,4 @@ classname=org.opensearch.performanceanalyzer.PerformanceAnalyzerPlugin
java.version=1.8
#
# 'opensearch.version' version of openSearch compiled against
opensearch.version=1.0.0-rc1
opensearch.version=1.0.0

0 comments on commit 31eb00e

Please sign in to comment.