Skip to content

Commit 25d419f

Browse files
committed
Removed oss in run_es.sh and clean_es_docker.sh
1 parent 26e724d commit 25d419f

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

travis/clean_es_docker.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#!/usr/bin/env bash
22

33
docker container rm --force --volumes elasticsearch > /dev/null 2>&1 || true
4-
docker container rm --force --volumes elasticsearch-oss > /dev/null 2>&1 || true
54
docker network ls | grep esnet > /dev/null || docker network create esnet > /dev/null
6-
docker network ls | grep esnet-oss > /dev/null || docker network create esnet-oss > /dev/null

travis/run_es.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ fi;
1111

1212
if [ "$TEST_SUITE" = "free" ]; then
1313
docker pull docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
14-
docker network create esnet-oss;
14+
docker network create esnet;
1515
docker run \
1616
--rm \
1717
--publish 9200:9200 \
1818
--env "node.attr.testattr=test" \
1919
--env "path.repo=/tmp" \
2020
--env "repositories.url.allowed_urls=http://snapshot.*" \
2121
--env "discovery.type=single-node" \
22-
--network=esnet-oss \
23-
--name=elasticsearch-oss \
22+
--network=esnet \
23+
--name=elasticsearch \
2424
--detach \
25-
docker.elastic.co/elasticsearch/elasticsearch-oss:${STACK_VERSION}
26-
docker run --network esnet-oss --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent http://elasticsearch-oss:9200
25+
docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION}
26+
docker run --network esnet --rm appropriate/curl --max-time 120 --retry 120 --retry-delay 1 --retry-connrefused --show-error --silent http://elasticsearch:9200
2727
else
2828

2929
repo=$(pwd)

0 commit comments

Comments
 (0)