Makes common-utils version dynamic and acceptable as input parameter …

…to gradle command

Signed-off-by: Darshit Chanpura <[email protected]>

README.md

@@ -74,7 +74,7 @@ Run all tests:
 
 Run tests against local cluster:
 ```bash
-./gradlew integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin
+./gradlew integTestRemote -Dtests.rest.cluster=localhost:9200 -Dtests.cluster=localhost:9200 -Dtests.clustername=docker-cluster -Dsecurity=true -Dhttps=true -Duser=admin -Dpassword=admin -Dcommon_utils.version="2.2.0.0"
 ```
 OR
 ```bash

build.gradle

@@ -21,9 +21,7 @@ buildscript {
         version_tokens = opensearch_version.tokenize('-')
         opensearch_build = version_tokens[0] + '.0'
 
-        // TODO: this property should be accessed dynamically once this issue is resolved:
-        // https://github.com/opensearch-project/common-utils/issues/205
-        common_utils_version = '2.1.0.0';
+        common_utils_version = System.getProperty("common_utils.version", opensearch_build)
 
 
         if (buildVersionQualifier) {

scripts/integtest.sh

@@ -20,10 +20,11 @@ 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 2.2.0.0"
     echo "--------------------------------------------------------------------------"
 }
 
-while getopts ":h:b:p:s:c:v:n:t:m:" arg; do
+while getopts ":h:b:p:s:c:v:n:t:m:u:" arg; do
     case $arg in
         h)
             usage
@@ -53,6 +54,9 @@ while getopts ":h:b:p:s:c:v:n:t:m:" arg; do
         n)
             # Do nothing as we're not consuming this param.
             ;;
+        u)
+            COMMON_UTILS_VERSION=$OPTARG
+            ;;
         :)
             echo "-${OPTARG} requires an argument"
             usage
@@ -95,8 +99,12 @@ if [ -z "$CLUSTER_NAME" ]
 then
   CLUSTER_NAME="docker-cluster"
 fi
+if [ -z "$COMMON_UTILS_VERSION" ]
+then
+  COMMON_UTILS_VERSION="2.2.0.0"
+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
+./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