Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move to latest .ci script structure (#1042)
Introduces a dedicated `run-repository.sh` for the repository custom bits. This allows us to keep `run-elasticsearch.sh` and `run-tests` in sync through file copying or patches easier. Co-authored-by: Tomas Della Vedova <delvedor@users.noreply.github.com>
- Loading branch information
Showing
4 changed files
with
130 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #!/usr/bin/env bash | ||
| # parameters are available to this script | ||
|
|
||
| # ELASTICSEARCH_VERSION -- version e.g Major.Minor.Patch(-Prelease) | ||
| # ELASTICSEARCH_CONTAINER -- the docker moniker as a reference to know which docker image distribution is used | ||
| # ELASTICSEARCH_URL -- The url at which elasticsearch is reachable | ||
| # NETWORK_NAME -- The docker network name | ||
| # NODE_NAME -- The docker container name also used as Elasticsearch node name | ||
| # NODE_JS_VERSION -- node js version (defined in test-matrix.yml, a default is hardcoded here) | ||
|
|
||
| NODE_JS_VERSION=${NODE_JS_VERSION-12} | ||
|
|
||
| echo -e "\033[34;1mINFO:\033[0m URL ${ELASTICSEARCH_URL}\033[0m" | ||
| echo -e "\033[34;1mINFO:\033[0m VERSION ${ELASTICSEARCH_VERSION}\033[0m" | ||
| echo -e "\033[34;1mINFO:\033[0m CONTAINER ${ELASTICSEARCH_CONTAINER}\033[0m" | ||
| echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m" | ||
| echo -e "\033[34;1mINFO:\033[0m NODE_JS_VERSION ${NODE_JS_VERSION}\033[0m" | ||
|
|
||
| echo -e "\033[1m>>>>> Build docker container >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" | ||
|
|
||
| set -eo pipefail | ||
|
|
||
| set +x | ||
| export VAULT_TOKEN=$(vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") | ||
| export CODECOV_TOKEN=$(vault read -field=token secret/clients-ci/elasticsearch-js/codecov) | ||
| unset VAULT_ROLE_ID VAULT_SECRET_ID VAULT_TOKEN | ||
| set -x | ||
|
|
||
| docker build \ | ||
| --file .ci/Dockerfile \ | ||
| --tag elastic/elasticsearch-js \ | ||
| --build-arg NODE_JS_VERSION=${NODE_JS_VERSION} \ | ||
| . | ||
|
|
||
| echo -e "\033[1m>>>>> NPM run ci >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" | ||
|
|
||
| repo=$(realpath $(dirname $(realpath -s $0))/../) | ||
|
|
||
| docker run \ | ||
| --network=${NETWORK_NAME} \ | ||
| --env "TEST_ES_SERVER=${ELASTICSEARCH_URL}" \ | ||
| --env "CODECOV_TOKEN" \ | ||
| --volume $repo:/usr/src/app \ | ||
| --volume /usr/src/app/node_modules \ | ||
| --name elasticsearch-js \ | ||
| --rm \ | ||
| elastic/elasticsearch-js \ | ||
| npm run ci |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,58 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # | ||
| # Runs the client tests via Docker with the expectation that the required | ||
| # environment variables have already been exported before running this script. | ||
| # | ||
| # The required environment variables include: | ||
| # | ||
| # - $ELASTICSEARCH_VERSION | ||
| # - $NODE_JS_VERSION | ||
| # - $TEST_SUITE | ||
| # | ||
| # Version 1.0 | ||
| # - Moved to .ci folder and seperated out `run-repository.sh` | ||
|
|
||
| set -eo pipefail | ||
| if [[ -z $ELASTICSEARCH_VERSION ]]; then | ||
| echo -e "\033[31;1mERROR:\033[0m Required environment variable [ELASTICSEARCH_VERSION] not set\033[0m" | ||
| exit 1 | ||
| fi | ||
| set -euxo pipefail | ||
|
|
||
| set +x | ||
| export VAULT_TOKEN=$(vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") | ||
| export CODECOV_TOKEN=$(vault read -field=token secret/clients-ci/elasticsearch-js/codecov) | ||
| unset VAULT_ROLE_ID VAULT_SECRET_ID VAULT_TOKEN | ||
| set -x | ||
|
|
||
| docker build \ | ||
| --file .ci/Dockerfile \ | ||
| --tag elastic/elasticsearch-js \ | ||
| --build-arg NODE_JS_VERSION=${NODE_JS_VERSION} \ | ||
| . | ||
| TEST_SUITE=${TEST_SUITE-oss} | ||
| NODE_NAME=instance | ||
|
|
||
| NODE_NAME="es1" | ||
| repo=$(pwd) | ||
| testnodecrt="/.ci/certs/testnode.crt" | ||
| testnodekey="/.ci/certs/testnode.key" | ||
| cacrt="/.ci/certs/ca.crt" | ||
|
|
||
| elasticsearch_image="elasticsearch" | ||
| elasticsearch_url="https://elastic:changeme@${NODE_NAME}:9200" | ||
| elasticsearch_image=elasticsearch | ||
| elasticsearch_url=https://elastic:changeme@${NODE_NAME}:9200 | ||
| if [[ $TEST_SUITE != "xpack" ]]; then | ||
| elasticsearch_image="elasticsearch-oss" | ||
| elasticsearch_url="http://${NODE_NAME}:9200" | ||
| elasticsearch_image=elasticsearch-${TEST_SUITE} | ||
| elasticsearch_url=http://${NODE_NAME}:9200 | ||
| fi | ||
|
|
||
| ELASTICSEARCH_VERSION="${elasticsearch_image}:${ELASTICSEARCH_VERSION}" \ | ||
| NODE_NAME="${NODE_NAME}" \ | ||
| NETWORK_NAME="esnet" \ | ||
| function cleanup { | ||
| status=$? | ||
| set +x | ||
| ELASTICSEARCH_VERSION=${elasticsearch_image}:${ELASTICSEARCH_VERSION} \ | ||
| NODE_NAME=${NODE_NAME} \ | ||
| NETWORK_NAME=elasticsearch \ | ||
| CLEANUP=true \ | ||
| bash ./.ci/run-elasticsearch.sh | ||
| # Report status and exit | ||
| if [[ "$status" == "0" ]]; then | ||
| echo -e "\n\033[32;1mSUCCESS run-tests\033[0m" | ||
| exit 0 | ||
| else | ||
| echo -e "\n\033[31;1mFAILURE during run-tests\033[0m" | ||
| exit ${status} | ||
| fi | ||
| } | ||
| trap cleanup EXIT | ||
|
|
||
| echo -e "\033[1m>>>>> Start [$ELASTICSEARCH_VERSION container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" | ||
|
|
||
| ELASTICSEARCH_VERSION=${elasticsearch_image}:${ELASTICSEARCH_VERSION} \ | ||
| NODE_NAME=${NODE_NAME} \ | ||
| NETWORK_NAME=elasticsearch \ | ||
| DETACH=true \ | ||
| SSL_CERT="${repo}${testnodecrt}" \ | ||
| SSL_KEY="${repo}${testnodekey}" \ | ||
| SSL_CA="${repo}${cacrt}" \ | ||
| bash .ci/run-elasticsearch.sh | ||
|
|
||
| docker run \ | ||
| --network=esnet \ | ||
| --env "TEST_ES_SERVER=${elasticsearch_url}" \ | ||
| --env "CODECOV_TOKEN" \ | ||
| --volume $repo:/usr/src/app \ | ||
| --volume /usr/src/app/node_modules \ | ||
| --name elasticsearch-js \ | ||
| --rm \ | ||
| elastic/elasticsearch-js \ | ||
| npm run ci | ||
| echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" | ||
|
|
||
| ELASTICSEARCH_CONTAINER=${elasticsearch_image}:${ELASTICSEARCH_VERSION} \ | ||
| NETWORK_NAME=elasticsearch \ | ||
| NODE_NAME=${NODE_NAME} \ | ||
| ELASTICSEARCH_URL=${elasticsearch_url} \ | ||
| bash .ci/run-repository.sh | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters