Skip to content

Commit

Permalink
Merge e813d29 into 665054b
Browse files Browse the repository at this point in the history
  • Loading branch information
opensearch-trigger-bot[bot] authored Aug 11, 2023
2 parents 665054b + e813d29 commit eb4de1a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
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.3.12.0.jar.sha1`
`rm -f licenses/performanceanalyzer-rca-1.3.13.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.3.12.0-SNAPSHOT.zip ./`
`cp <Performance Analyzer plugin root>/build/distributions/opensearch-performance-analyzer-1.3.13.0-SNAPSHOT.zip ./`

### Installation

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "1.3.12-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "1.3.13-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
gitPaBranch = '1.3'
gitPaRepo = "https://github.com/opensearch-project/performance-analyzer.git"
Expand Down
14 changes: 7 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ WORKDIR /usr/share/opensearch
ENV BUST_CACHE 1576286189

# Download and extract defined OpenSearch version.
RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/1.3.12-SNAPSHOT/opensearch-min-1.3.12-SNAPSHOT-linux-x64-latest.tar.gz | \
RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/1.3.13-SNAPSHOT/opensearch-min-1.3.13-SNAPSHOT-linux-x64-latest.tar.gz | \
tar zx --strip-components=1

RUN set -ex && for opensearchdirs in config data logs; do \
Expand All @@ -38,20 +38,20 @@ RUN set -ex && for opensearchdirs in config data logs; do \

COPY --chown=1000:0 opensearch.yml log4j2.properties config/

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

COPY --chown=1000:0 opensearch-performance-analyzer-1.3.12.0-SNAPSHOT.zip /tmp/
COPY --chown=1000:0 opensearch-performance-analyzer-1.3.13.0-SNAPSHOT.zip /tmp/

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

USER 0

# Set gid to 0 for opensearch and make group permission similar to that of user
RUN chown -R opensearch:0 . && \
chmod -R g=u /usr/share/opensearch

RUN unzip config/performance-analyzer-rca-1.3.12.0-SNAPSHOT.zip
RUN unzip config/performance-analyzer-rca-1.3.13.0-SNAPSHOT.zip

RUN chmod -R 755 /dev/shm
################################################################################
Expand Down Expand Up @@ -123,7 +123,7 @@ EXPOSE 9200 9300 9600 9650

LABEL org.label-schema.schema-version="1.0" \
org.label-schema.name="opensearch" \
org.label-schema.version="1.3.12" \
org.label-schema.version="1.3.13" \
org.label-schema.url="https://opensearch.org/" \
org.label-schema.vcs-url="https://github.com/opensearch-project/opensearch-build" \
org.label-schema.license="Apache-2.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.3.12.0
version=1.3.13.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.3.12
opensearch.version=1.3.13

0 comments on commit eb4de1a

Please sign in to comment.