Skip to content

Commit

Permalink
Updated Integ Tests, removed duplicate *.tokens and added http files …
Browse files Browse the repository at this point in the history
…to gitignore.

Signed-off-by: Vamsi Manohar <[email protected]>
  • Loading branch information
vamsimanohar committed Mar 2, 2023
1 parent e08825d commit 54e11a5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*.class
*.http
.settings/
# Mobile Tools for Java (J2ME)
.mtj.tmp/
Expand Down Expand Up @@ -33,7 +34,6 @@ gen/
# git mergetool artifact
*.orig
gen
*.tokens

# Python
*/.venv
Expand Down
8 changes: 4 additions & 4 deletions scripts/integtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ USERNAME=`echo $CREDENTIAL | awk -F ':' '{print $1}'`
PASSWORD=`echo $CREDENTIAL | awk -F ':' '{print $2}'`

OS="`uname`"
##Cygwin or MinGW packages should be preinstalled in the windows.
## This command doesn't work without bash
## https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux
#Cygwin or MinGW packages should be preinstalled in the windows.
#This command doesn't work without bash
#https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux
#Operating System uname -s
#Mac OS X Darwin
#Cygwin 32-bit (Win-XP) CYGWIN_NT-5.1
Expand All @@ -110,7 +110,7 @@ OS="`uname`"
#Interix (Services for UNIX) Interix
#MSYS MSYS_NT-6.1
#MSYS2 MSYS_NT-10.0-17763
if [[ $OS =~ CYGWIN*|MINGW*|MINGW32*|MSYS* ]]
if ! [[ $OS =~ CYGWIN*|MINGW*|MINGW32*|MSYS* ]]
then
OPENSEARCH_HOME=`ps -ef | grep -o "[o]pensearch.path.home=\S\+" | cut -d= -f2- | head -n1`
curl -SL https://raw.githubusercontent.com/opensearch-project/sql/main/integ-test/src/test/resources/datasource/datasources.json -o "$OPENSEARCH_HOME"/datasources.json
Expand Down

0 comments on commit 54e11a5

Please sign in to comment.