Remove STACK_VERSION variable
Signed-off-by: Rushi Agrawal <[email protected]>
This commit is contained in:
@@ -4,16 +4,6 @@
|
|||||||
#
|
#
|
||||||
# Version 1.0.1
|
# Version 1.0.1
|
||||||
# - Initial version after refactor
|
# - Initial version after refactor
|
||||||
# - Validate STACK_VERSION asap
|
|
||||||
|
|
||||||
function require_stack_version() {
|
|
||||||
if [[ -z $STACK_VERSION ]]; then
|
|
||||||
echo -e "\033[31;1mERROR:\033[0m Required environment variable [STACK_VERSION] not set\033[0m"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
require_stack_version
|
|
||||||
|
|
||||||
if [[ -z $es_node_name ]]; then
|
if [[ -z $es_node_name ]]; then
|
||||||
# only set these once
|
# only set these once
|
||||||
@@ -33,7 +23,7 @@ if [[ -z $es_node_name ]]; then
|
|||||||
|
|
||||||
export elasticsearch_url=$ELASTICSEARCH_URL_EXTENSION://${es_node_name}:9200
|
export elasticsearch_url=$ELASTICSEARCH_URL_EXTENSION://${es_node_name}:9200
|
||||||
export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
|
export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
|
||||||
export elasticsearch_container="${elasticsearch_image}:${STACK_VERSION}"
|
export elasticsearch_container="${elasticsearch_image}:latest"
|
||||||
|
|
||||||
export suffix=rest-test
|
export suffix=rest-test
|
||||||
export moniker=$(echo "$elasticsearch_container" | tr -C "[:alnum:]" '-')
|
export moniker=$(echo "$elasticsearch_container" | tr -C "[:alnum:]" '-')
|
||||||
|
|||||||
+1
-2
@@ -5,7 +5,6 @@
|
|||||||
# - Add `$RUNSCRIPTS` env var for running Elasticsearch dependent products
|
# - Add `$RUNSCRIPTS` env var for running Elasticsearch dependent products
|
||||||
|
|
||||||
# Default environment variables
|
# Default environment variables
|
||||||
export STACK_VERSION="${STACK_VERSION:=latest}"
|
|
||||||
export TEST_SUITE="${TEST_SUITE:=oss}"
|
export TEST_SUITE="${TEST_SUITE:=oss}"
|
||||||
export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
|
export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
|
||||||
export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
|
export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
|
||||||
@@ -16,7 +15,7 @@ script_path=$(dirname $(realpath -s $0))
|
|||||||
source $script_path/functions/imports.sh
|
source $script_path/functions/imports.sh
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
echo -e "\033[1m>>>>> Start [$STACK_VERSION container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
|
echo -e "\033[1m>>>>> Start server container >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
|
||||||
DETACH=true bash .ci/run-elasticsearch.sh
|
DETACH=true bash .ci/run-elasticsearch.sh
|
||||||
|
|
||||||
if [[ -n "$RUNSCRIPTS" ]]; then
|
if [[ -n "$RUNSCRIPTS" ]]; then
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
STACK_VERSION:
|
|
||||||
- 7.10.2
|
|
||||||
|
|
||||||
TEST_SUITE:
|
TEST_SUITE:
|
||||||
- oss
|
- oss
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user