diff --git a/.github/workflows/gauntlet-tests-workflow.yml b/.github/workflows/gauntlet-tests-workflow.yml index a02add9fa..7807c9a57 100644 --- a/.github/workflows/gauntlet-tests-workflow.yml +++ b/.github/workflows/gauntlet-tests-workflow.yml @@ -25,4 +25,4 @@ jobs: path: ./tmp/performance-analyzer-rca - name: Build RCA and run Gauntlet tests working-directory: ./tmp/performance-analyzer-rca - run: ./gradlew build -Drun.gauntlet.tests=true -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew build -Drun.gauntlet.tests=true -Dopensearch.version=1.2.1-SNAPSHOT diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6768dfb8d..9f7d65286 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -26,7 +26,7 @@ jobs: path: ./tmp/performance-analyzer-rca - name: Build RCA working-directory: ./tmp/performance-analyzer-rca - run: ./gradlew build --stacktrace -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew build --stacktrace -Dopensearch.version=1.2.1-SNAPSHOT - name: Upload reports uses: actions/upload-artifact@v2 with: @@ -42,21 +42,21 @@ jobs: run: bash <(curl -s https://codecov.io/bash) -f ./build/reports/jacoco/test/jacocoTestReport.xml - name: Publish RCA jar to maven local working-directory: ./tmp/performance-analyzer-rca - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.2.1-SNAPSHOT # PA in ./tmp/performance-analyzer - name: Checkout Performance Analyzer uses: actions/checkout@v2 with: - repository: opensearch-project/performance-analyzer - ref: 1.2 + repository: sruti1312/performance-analyzer-1 + ref: feature/upgrade-1.2.1 path: ./tmp/performance-analyzer - name: Build PA gradle using the new RCA jar working-directory: ./tmp/performance-analyzer run: rm -f licenses/performanceanalyzer-rca-*.jar.sha1 - name: Update SHA working-directory: ./tmp/performance-analyzer - run: ./gradlew updateShas -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew updateShas -Dopensearch.version=1.2.1-SNAPSHOT - name: Set docker-compose path run: echo "DOCKER_COMPOSE_LOCATION=$(which docker-compose)" >> $GITHUB_ENV # Set the vm.max_map_count system property to the minimum required to run OpenSearch @@ -64,14 +64,14 @@ jobs: run: sudo sysctl -w vm.max_map_count=262144 - name: Build PA and run Unit Tests working-directory: ./tmp/performance-analyzer - run: ./gradlew build -i -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew build -i -Dopensearch.version=1.2.1-SNAPSHOT # Enable RCA for Integration Tests - name: Spin up Docker cluster for integ testing working-directory: ./tmp/performance-analyzer-rca - run: ./gradlew enableRca -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew enableRca -Dopensearch.version=1.2.1-SNAPSHOT # Run Integration Tests in PA - name: Run integration tests working-directory: ./tmp/performance-analyzer - run: ./gradlew integTest --info --stacktrace -Dtests.enableIT=true -Dopensearch.version=1.2.0-SNAPSHOT + run: ./gradlew integTest --info --stacktrace -Dtests.enableIT=true -Dopensearch.version=1.2.1-SNAPSHOT diff --git a/build.gradle b/build.gradle index 6183b38c2..35a6adafc 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ distributions { } ext { - opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") gitPaBranch = '1.2' gitPaRepo = "https://github.com/opensearch-project/performance-analyzer.git" @@ -322,8 +322,8 @@ dependencies { compile 'com.google.guava:guava:28.2-jre' compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.0' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.0' + compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0' + compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.15.0' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9' compile group: 'commons-io', name: 'commons-io', version: '2.7' implementation 'io.grpc:grpc-netty-shaded:1.28.0' diff --git a/docker/Dockerfile b/docker/Dockerfile index cd0268748..26cb8c9c4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,7 +49,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.2.0-SNAPSHOT/opensearch-min-1.2.0-SNAPSHOT-linux-arm64-latest.tar.gz | \ +RUN curl -fsSL https://artifacts.opensearch.org/snapshots/core/opensearch/1.2.1-SNAPSHOT/opensearch-min-1.2.1-SNAPSHOT-linux-arm64-latest.tar.gz | \ tar zx --strip-components=1 RUN set -ex && for opensearchdirs in config data logs; do \ @@ -58,12 +58,12 @@ 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.2.0.0-SNAPSHOT.zip config/ +COPY --chown=1000:0 performance-analyzer-rca-1.2.1.0-SNAPSHOT.zip config/ -COPY --chown=1000:0 opensearch-performance-analyzer-1.2.0.0-SNAPSHOT.zip /tmp/ +COPY --chown=1000:0 opensearch-performance-analyzer-1.2.1.0-SNAPSHOT.zip /tmp/ -RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.2.0.0-SNAPSHOT.zip; \ - rm /tmp/opensearch-performance-analyzer-1.2.0.0-SNAPSHOT.zip +RUN opensearch-plugin install --batch file:///tmp/opensearch-performance-analyzer-1.2.1.0-SNAPSHOT.zip; \ + rm /tmp/opensearch-performance-analyzer-1.2.1.0-SNAPSHOT.zip USER 0 @@ -71,7 +71,7 @@ USER 0 RUN chown -R opensearch:0 . && \ chmod -R g=u /usr/share/opensearch -RUN unzip config/performance-analyzer-rca-1.2.0.0-SNAPSHOT.zip +RUN unzip config/performance-analyzer-rca-1.2.1.0-SNAPSHOT.zip RUN cp -r performance-analyzer-rca/* plugins/opensearch-performance-analyzer/ RUN chmod 755 /usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent @@ -144,7 +144,7 @@ EXPOSE 9200 9300 9600 9650 LABEL org.label-schema.schema-version="1.0" \ org.label-schema.name="opensearch" \ - org.label-schema.version="1.2.0" \ + org.label-schema.version="1.2.1" \ 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" \