diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f6ced1152..96bb5210a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -67,7 +67,7 @@ jobs: working-directory: ./tmp/pa run: ./gradlew updateShas - name: Set docker-compose path - run: DOCKER_COMPOSE_LOCATION=$(which docker-compose) + 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 - name: Set vm.max_map_count run: sudo sysctl -w vm.max_map_count=262144 diff --git a/build.gradle b/build.gradle index 3a415ef82..3937d2bc4 100644 --- a/build.gradle +++ b/build.gradle @@ -222,6 +222,9 @@ test { excludeTestsMatching 'com.amazon.opendistro.opensearch.performanceanalyzer.rca.integTests.tests.consolidate_tuning.JvmFlipFlopITest' } enabled = true + retry { + maxRetries = 2 + } } task rcaTest(type: Test) { @@ -395,14 +398,11 @@ task copyAllArtifacts(type: Copy) { 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-beta1-SNAPSHOT.zip') - // Replace this path to point to opensearch artifact local location - def opensearchArtifacts = Paths.get('../opensearch-1.0.0-beta1-linux-x64.tar.gz') dockerArtifactsDir = Paths.get(dockerBuildDir, 'rca-docker') from(dockerArtifacts) from(rcaArtifacts) from(paArtifacts) - from(opensearchArtifacts) into(dockerArtifactsDir) } diff --git a/docker/Dockerfile b/docker/Dockerfile index 8208c6add..cab4f8b80 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,9 +49,8 @@ WORKDIR /usr/share/opensearch ENV BUST_CACHE 1576286189 # Download and extract defined OpenSearch version. -# TODO: Modify this link to the opensearch artifact link -COPY opensearch-1.0.0-beta1-linux-x64.tar.gz . -RUN tar -xf opensearch-1.0.0-beta1-linux-x64.tar.gz --strip-component=1 +RUN curl -fsSL https://artifacts.opensearch.org/releases/core/opensearch/1.0.0-beta1/opensearch-1.0.0-beta1-linux-x64.tar.gz | \ + tar zx --strip-components=1 RUN set -ex && for opensearchdirs in config data logs; do \ mkdir -p "$opensearchdirs"; \