Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Modify ES and PA version (#513)
Browse files Browse the repository at this point in the history
sruti1312 authored Nov 18, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent ab582b6 commit 36203ef
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ jobs:
run: ./gradlew publishToMavenLocal
- name: Build PA gradle using the new RCA jar
working-directory: ./tmp/pa
run: rm licenses/performanceanalyzer-rca-1.10.jar.sha1
run: rm licenses/performanceanalyzer-rca-1.11.jar.sha1
- name: Update SHA
working-directory: ./tmp/pa
run: ./gradlew updateShas
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -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-1.10.jar.sha1`
`rm -f licenses/performanceanalyzer-1.11.jar.sha1`

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

@@ -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/opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip ./`
`cp <Performance Analyzer plugin root>/build/distributions/opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip ./`

### Installation

8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -70,14 +70,14 @@ publishing {
maven(MavenPublication) {
groupId = 'com.amazon.opendistro.elasticsearch'
artifactId = 'performanceanalyzer-rca'
version = '1.10'
version = '1.11'
from components.java
}
}
}

ext {
opendistroVersion = '1.10'
opendistroVersion = '1.11'
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
}

@@ -343,7 +343,7 @@ task cloneGitRepo(type: GitClone) {

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

@@ -366,7 +366,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', 'opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip')
def paArtifacts = Paths.get(paDir, 'build', 'distributions', 'opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip')

dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker')
from(dockerArtifacts)
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ WORKDIR /usr/share/elasticsearch
ENV BUST_CACHE 1576286189

# Download and extract defined ES version.
RUN curl -fsSL https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.3.2-linux-x86_64.tar.gz | \
RUN curl -fsSL https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.9.1-linux-x86_64.tar.gz | \
tar zx --strip-components=1

RUN set -ex && for esdirs in config data logs; do \
@@ -49,10 +49,10 @@ COPY --chown=1000:0 elasticsearch.yml log4j2.properties config/

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

COPY --chown=1000:0 opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip /tmp/
COPY --chown=1000:0 opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip /tmp/

RUN elasticsearch-plugin install --batch file:///tmp/opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip; \
rm /tmp/opendistro_performance_analyzer-1.10.0.0-SNAPSHOT.zip
RUN elasticsearch-plugin install --batch file:///tmp/opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip; \
rm /tmp/opendistro_performance_analyzer-1.11.0.0-SNAPSHOT.zip

USER 0

0 comments on commit 36203ef

Please sign in to comment.