Skip to content

Commit

Permalink
Updates integTestRemote task to dynamically fetch common-utils versio…
Browse files Browse the repository at this point in the history
…n from build.gradle (opensearch-project#3122)


Fixes integTestRemote task to dynamically fetch common-utils version
from build.gradle instead of hard-coding it in the shell script

* Category : Refactoring

* Why these changes are required?
A temporary fix (opensearch-project#3018) was added to resolve CI failures in RC
generation caused due to out-of-date common-utils version being used in
the sanity test.

### Issues Resolved
Related to comment:
opensearch-project#3018 (comment)

**This changes addresses the issue permanently by modifying
integTestRemote task to fetch the common-utils version dynamically from
build.gradle, and prevent blocking RC builds in future due to such
issue**


Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
  • Loading branch information
DarshitChanpura authored Aug 9, 2023
1 parent 5f7efa5 commit 46989b5
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions scripts/integtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function usage() {
echo -e "-v OPENSEARCH_VERSION\t, no defaults"
echo -e "-n SNAPSHOT\t, defaults to false"
echo -e "-m CLUSTER_NAME\t, defaults to docker-cluster"
echo -e "-u COMMON_UTILS_VERSION\t, defaults to 3.0.0.0-SNAPSHOT"
echo "--------------------------------------------------------------------------"
}

Expand Down Expand Up @@ -99,12 +98,8 @@ if [ -z "$CLUSTER_NAME" ]
then
CLUSTER_NAME="docker-cluster"
fi
if [ -z "$COMMON_UTILS_VERSION" ]
then
COMMON_UTILS_VERSION="3.0.0.0-SNAPSHOT"
fi

USERNAME=`echo $CREDENTIAL | awk -F ':' '{print $1}'`
PASSWORD=`echo $CREDENTIAL | awk -F ':' '{print $2}'`

./gradlew integTestRemote -Dtests.rest.cluster="$BIND_ADDRESS:$BIND_PORT" -Dtests.cluster="$BIND_ADDRESS:$BIND_PORT" -Dsecurity_enabled=$SECURITY_ENABLED -Dtests.clustername=$CLUSTER_NAME -Dhttps=true -Duser=$USERNAME -Dpassword=$PASSWORD -Dcommon_utils.version=$COMMON_UTILS_VERSION
./gradlew integTestRemote -Dtests.rest.cluster="$BIND_ADDRESS:$BIND_PORT" -Dtests.cluster="$BIND_ADDRESS:$BIND_PORT" -Dsecurity_enabled=$SECURITY_ENABLED -Dtests.clustername=$CLUSTER_NAME -Dhttps=true -Duser=$USERNAME -Dpassword=$PASSWORD

0 comments on commit 46989b5

Please sign in to comment.