Skip to content
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

Try to fix flakiness of appsearch system tests #15878

Merged
merged 5 commits into from
Jan 28, 2020
Merged

Try to fix flakiness of appsearch system tests #15878

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f635b52
Check HTTP response code in appsearch healthcheck
jsoriano Jan 27, 2020
ed16cc9
Rever change in allocatable memory
jsoriano Jan 27, 2020
d3f3fe0
To revert: Enable verbosity
jsoriano Jan 27, 2020
a825ebc
Always print standard output in nosetests
jsoriano Jan 27, 2020
f20cbf0
Fix typo
jsoriano Jan 28, 2020
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
5 changes: 3 additions & 2 deletions x-pack/metricbeat/module/appsearch/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM docker.elastic.co/app-search/app-search:7.5.0
ARG APPSEARCH_VERSION
FROM docker.elastic.co/app-search/app-search:${APPSEARCH_VERSION}

COPY docker-entrypoint-dependencies.sh /usr/local/bin/
ENTRYPOINT /usr/local/bin/docker-entrypoint-dependencies.sh

HEALTHCHECK --interval=1s --retries=300 --start-period=60s CMD python -c 'import urllib, json; response = urllib.urlopen("http://myelastic:changeme@localhost:3002/swiftype-app-version"); data = json.loads(response.read()); exit(0);'
HEALTHCHECK --interval=1s --retries=300 --start-period=60s CMD python -c 'import urllib, json; response = urllib.urlopen("http://myelastic:changeme@localhost:3002/api/as/v1/internal/health"); response.getcode() == 200 or exit(1); data = json.loads(response.read()); exit(0);'
5 changes: 4 additions & 1 deletion x-pack/metricbeat/module/appsearch/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ version: '2.3'

services:
appsearch:
image: docker.elastic.co/integrations-ci/beats-appsearch:${APPSEARCH_VERSION:-7.5.0}-1
build:
context: ./_meta
args:
APPSEARCH_VERSION: ${APPSEARCH_VERSION:-7.5.0}
depends_on:
- elasticsearch
environment:
- "elasticsearch.host=http://elasticsearch:9200"
- "allow_es_settings_modification=true"
- "JAVA_OPTS=-Xms2g -Xmx2g"
- "JAVA_OPTS=-Xms1g -Xmx1g"
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
ports:
- 3002
command: --process app-server
Expand Down