Skip to content

Commit

Permalink
Temporarily switching to latest for integration tests (#6416)
Browse files Browse the repository at this point in the history
* Temporarily switching to `latest` for integration tests

The Elasticsearch snapshots are broken for a several days
(xpack installation fails). This temporarily switches to using
latest (currently 6.2.1) for our testing, so we don't get used
to the builds being red.  Install -platinum in 'latest' so we can
test with Machine Learning
  • Loading branch information
tsg authored and ph committed Feb 20, 2018
1 parent db49ae8 commit 33ff735
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ STRESS_TESTS?=false ## @testing if true, "make test" and "make testsuite" run al
GOX_OS?=linux darwin windows freebsd netbsd openbsd ## @Building List of all OS to be supported by "make crosscompile".
GOX_OSARCH?=!darwin/arm !darwin/arm64 !darwin/386 ## @building Space separated list of GOOS/GOARCH pairs to build by "make crosscompile".
GOX_FLAGS?= ## @building Additional flags to append to the gox command used by "make crosscompile".
TESTING_ENVIRONMENT?=snapshot## @testing The name of the environment under test
# XXX: Should be switched back to `snapshot` once the Elasticsearch
# snapshots are working. https://github.com/elastic/beats/pull/6416
TESTING_ENVIRONMENT?=latest## @testing The name of the environment under test
BEAT_VERSION=$(shell head -n 1 ${ES_BEATS}/libbeat/docs/version.asciidoc | cut -c 17- )
COMMIT_ID=$(shell git rev-parse HEAD)
DOCKER_COMPOSE_PROJECT_NAME?=${BEAT_NAME}${TESTING_ENVIRONMENT}${BEAT_VERSION}${COMMIT_ID} ## @testing The name of the docker-compose project used by the integration and system tests
Expand Down
2 changes: 1 addition & 1 deletion testing/environments/latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: '2.1'
services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:6.2.1
image: docker.elastic.co/elasticsearch/elasticsearch-platinum:6.2.1
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9200"]
environment:
Expand Down

0 comments on commit 33ff735

Please sign in to comment.