From 9313a0873349414f2459ad4d89f800ccbaec1cd6 Mon Sep 17 00:00:00 2001 From: delvedor Date: Mon, 28 Oct 2019 16:59:51 +0100 Subject: [PATCH] Updated run-test script --- .ci/run-tests | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.ci/run-tests b/.ci/run-tests index b69d500af..92fc1e688 100755 --- a/.ci/run-tests +++ b/.ci/run-tests @@ -38,14 +38,20 @@ if [[ $TEST_SUITE != "xpack" ]]; then elasticsearch_url="http://${NODE_NAME}:9200" fi -ELASTICSEARCH_VERSION="${elasticsearch_image}:${ELASTICSEARCH_VERSION}" \ - NODE_NAME="${NODE_NAME}" \ - NETWORK_NAME="esnet" \ - DETACH=true \ - SSL_CERT="${repo}${testnodecrt}" \ - SSL_KEY="${repo}${testnodekey}" \ - SSL_CA="${repo}${cacrt}" \ - bash .ci/run-elasticsearch.sh +docker run \ + --rm \ + --env "node.attr.testattr=test" \ + --env "path.repo=/tmp" \ + --env "repositories.url.allowed_urls=http://snapshot.*" \ + --env "discovery.zen.ping.unicast.hosts=${NODE_NAME}" \ + --env "xpack.security.enabled=false" \ + --env "xpack.monitoring.enabled=false" \ + --env "xpack.ml.enabled=false" \ + --env ES_JAVA_OPTS="-Xms1g -Xmx1g" \ + --network=esnet \ + --name=$NODE_NAME \ + --detach \ + docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION} docker run \ --network=esnet \