Skip to content

Commit

Permalink
CI: Separate "ELASTICSEARCH_VERSION" and "ELASTICSEARCH_VERSION" envi…
Browse files Browse the repository at this point in the history
…ronment variables
  • Loading branch information
karmi committed Mar 22, 2020
1 parent 255fe3a commit c3e8c65
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .jenkins/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ docker build --file Dockerfile --tag elastic/go-elasticsearch .
(make cluster detach=true version=$elasticsearch_image)

# Store the Elasticsearch version and build hash
ELASTICSEARCH_VERSION=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.number')
ELASTICSEARCH_BUILD_VERSION=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.number')
ELASTICSEARCH_BUILD_HASH=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.build_hash')

# Download Elasticsearch source code at ELASTICSEARCH_BUILD_HASH and store it in a container
Expand All @@ -68,6 +68,7 @@ docker run \
--network elasticsearch \
--env "ELASTICSEARCH_URL=$elasticsearch_url" \
--env "ELASTICSEARCH_VERSION=$ELASTICSEARCH_VERSION" \
--env "ELASTICSEARCH_BUILD_VERSION=$ELASTICSEARCH_BUILD_VERSION" \
--env "ELASTICSEARCH_BUILD_HASH=$ELASTICSEARCH_BUILD_HASH" \
--env "WORKSPACE=${WORKSPACE:-/workspace}" \
--volume "/go-elasticsearch" \
Expand Down

0 comments on commit c3e8c65

Please sign in to comment.