From 46989b57d9cdf969be9473d1ca6bcb61c7923135 Mon Sep 17 00:00:00 2001 From: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:06:11 -0400 Subject: [PATCH] Updates integTestRemote task to dynamically fetch common-utils version from build.gradle (#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 (#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: https://github.com/opensearch-project/security/pull/3018#issuecomment-1638612650 **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 --- scripts/integtest.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/integtest.sh b/scripts/integtest.sh index 0401d00fa0..98ee40fbd6 100755 --- a/scripts/integtest.sh +++ b/scripts/integtest.sh @@ -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 "--------------------------------------------------------------------------" } @@ -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