Skip to content

Update docker artifact link #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sruti1312 merged 4 commits into from
Apr 29, 2021
Merged

Update docker artifact link #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
484ba4e
Update docker artifact
sruti1312 Apr 27, 2021
dca5203
Remove unit test in CI
sruti1312 Apr 28, 2021
171b79b
Fix docker compose path issue
sruti1312 Apr 28, 2021
8164aed
Add retry to fix flaky tests
sruti1312 Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
}

Expand Down
5 changes: 2 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"; \
Expand Down