trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [03/14] incubator-trafodion git commit: fixed issues
Date Wed, 30 Sep 2015 16:39:29 GMT
fixed issues


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e2cfb6ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e2cfb6ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e2cfb6ef

Branch: refs/heads/master
Commit: e2cfb6ef1c57cc9fcdc0799ba5384dc98eb98a4c
Parents: 67f8566
Author: Anuradha Hegde <anuradha.hegde@esgyn.com>
Authored: Fri Sep 18 17:09:17 2015 +0000
Committer: Anuradha Hegde <anuradha.hegde@esgyn.com>
Committed: Fri Sep 18 17:09:17 2015 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/install_traf_components | 42 ++++++++---------------
 dcs/src/test/pytests/test-requirements.txt   |  2 +-
 2 files changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e2cfb6ef/core/sqf/sql/scripts/install_traf_components
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_traf_components b/core/sqf/sql/scripts/install_traf_components
index 1b32db8..8b61d40 100755
--- a/core/sqf/sql/scripts/install_traf_components
+++ b/core/sqf/sql/scripts/install_traf_components
@@ -31,7 +31,7 @@ if [ -z "$CLIENT_TAR" ]; then
     CLIENT_TAR=$TRAF_TARS/*clients*.tgz
 fi
 
-if [ -f "$CLIENT_TAR" ]; then
+if [ -f $CLIENT_TAR ]; then
    cd $MY_SW_ROOT
    tar -xzf $CLIENT_TAR *Linux*
    tar -xzf $CLIENT_TAR *odb*
@@ -60,11 +60,11 @@ echo "   For local hadoop... $MY_SW_ROOT" | tee -a ${MY_LOG_FILE}
 echo "   For DCS_TAR... $DCS_TAR" | tee -a ${MY_LOG_FILE}
 echo "   For REST_TAR... $REST_TAR" | tee -a ${MY_LOG_FILE}
 
-if [ -f "$PHX_TAR" ]; then
+if [ -f $PHX_TAR ]; then
   echo "   For PHX_TAR... $PHX_TAR" | tee -a ${MY_LOG_FILE}
 fi
 
-if [ -f "$CLIENT_TAR" ]; then
+if [ -f $CLIENT_TAR ]; then
   echo "   For CLIENT_TAR... $CLIENT_TAR" | tee -a ${MY_LOG_FILE}
   echo "      For ODB_TAR... $ODB_TAR" | tee -a ${MY_LOG_FILE}
   echo "      For LNXDRVR_TAR... $LNXDRVR_TAR" | tee -a ${MY_LOG_FILE}
@@ -78,18 +78,12 @@ echo | tee -a ${MY_LOG_FILE}
 if [ -d dcs-* ]; then
   echo "DCS files already exist, skipping DCS setup" | tee -a ${MY_LOG_FILE}
 else
-  if [ -n "$DCS_URL" ]; then 
-    echo "Downloading DCS Tar: $DCS_URL" | tee -a ${MY_LOG_FILE}
-    rm -f dcs_download.tar
-    curl ${DCS_URL} -o dcs_download.tar
-    DCS_TAR=./dcs_download.tar
-  else
-    if [ -f "$DCS_TAR" ]; then
+  if [ -f $DCS_TAR ]; then
       echo "Using DCS Tar: $DCS_TAR" | tee -a ${MY_LOG_FILE}
-    elif [ -d "$DCS_SRC" ]; then
+  elif [ -d "$DCS_SRC" ]; then
       echo "DCS tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
       echo "Building DCS tar file" | tee -a ${MY_LOG_FILE}
-      if [ -f "$MY_SQROOT/export/lib/jdbcT4.jar" ]; then
+      if [ -f $MY_SQROOT/export/lib/jdbcT4.jar ]; then
          echo "JDBCT4 jar file exist. Proceeding to build DCS from $DCS_SRC" | tee -a ${MY_LOG_FILE}
          cd $DCS_SRC
          ${MAVEN:-mvn} clean site package >>${MY_LOG_FILE} 2>&1
@@ -100,7 +94,6 @@ else
          echo "Please build the core Trafodion component"  | tee -a ${MY_LOG_FILE}
          exit 2
       fi
-    fi
   fi
 
 # Install DCS
@@ -159,15 +152,9 @@ echo | tee -a ${MY_LOG_FILE}
 if [ -d rest-* ]; then
   echo "REST files already exist, skipping REST setup"
 else
-  if [ -n "$REST_URL" ]; then
-    echo "Downloading REST Tar: $REST_URL" | tee -a ${MY_LOG_FILE}
-    rm -f rest_download.tar
-    curl ${REST_URL} -o rest_download.tar
-    REST_TAR=./rest_download.tar
-  else
-    if [ -f "$REST_TAR" ]; then
+  if [ -f $REST_TAR ]; then
         echo "Using REST Tar: $REST_TAR" | tee -a ${MY_LOG_FILE}
-    elif [ -d "$REST_SRC" ]; then
+  elif [ -d "$REST_SRC" ]; then
       echo "REST tar file was not found in $TRAF_TARS" | tee -a ${MY_LOG_FILE}
       echo "Building REST tar file" | tee -a ${MY_LOG_FILE}
       if [ -f $MY_SQROOT/export/lib/jdbcT4.jar ]; then
@@ -180,7 +167,6 @@ else
          echo "JDBCT4 jar file does not exist $MY_SQROOT/export/lib folder. Please build
the core Trafodion components" | tee -a ${MY_LOG_FILE}
        exit 2
       fi
-    fi
   fi
 
 # Install REST
@@ -233,7 +219,7 @@ HNAME=localhost:$MY_DCS_MASTER_PORT
 UNAME=zz
 PWORD=zz
 
-$MY_SQROOT/trafci/bin/trafci.sh -h $HNAME -u $UNAME -p $PWORD
+$MY_SQROOT/trafci/bin/trafci.sh -h "$HNAME" -u "$UNAME" -p "$PWORD"
 EOF
   chmod +x $MY_SQROOT/sql/scripts/swtrafci
 else
@@ -250,7 +236,7 @@ PHXDIR=$MY_SW_ROOT/tests/phx
 if [ -d "$PHXDIR" ]; then
   echo "Phoenix tests already exist $PHXDIR, skipping Phoenix test setup" | tee -a ${MY_LOG_FILE}
 else
-  if [ -f "$PHX_TAR" ]; then
+  if [ -f $PHX_TAR ]; then
     echo "Installing Phoenix tests $PHX_TAR"| tee -a ${MY_LOG_FILE}
     tar -xzf $PHX_TAR | tee -a ${MY_LOG_FILE}
     echo "Successfully installed Phoenix tests "| tee -a ${MY_LOG_FILE}
@@ -292,10 +278,10 @@ echo | tee -a ${MY_LOG_FILE}
 
 LNXDRVR=$MY_SW_ROOT/lnxdrvr
 
-if [ -d $LNXDRVR ]; then
+if [ -d "$LNXDRVR" ]; then
   echo "Linux driver files already exist $LNXDRVR, skipping Linux Driver setup" | tee -a
${MY_LOG_FILE}
 else
-  if [ -f "$LNXDRVR_TAR" ]; then
+  if [ -f $LNXDRVR_TAR ]; then
      echo "Installing Linux driver: $LNXDRV"| tee -a ${MY_LOG_FILE}
      mkdir -p $LNXDRVR | tee -a ${MY_LOG_FILE}
      cd $LNXDRVR 
@@ -325,10 +311,10 @@ echo | tee -a ${MY_LOG_FILE}
 
 ODBLOC=$MY_SW_ROOT/odb
 
-if [ -d $ODBLOC ]; then
+if [ -d "$ODBLOC" ]; then
   echo "ODB files already exist $ODBLOC, skipping ODB setup" | tee -a ${MY_LOG_FILE}
 else
-  if [ -f "$ODB_TAR" ]; then
+  if [ -f $ODB_TAR ]; then
     echo "Installing ODB tool: $ODBLOC"| tee -a ${MY_LOG_FILE}
     mkdir -p $ODBLOC | tee -a ${MY_LOG_FILE}
     cd $ODBLOC 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e2cfb6ef/dcs/src/test/pytests/test-requirements.txt
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/test-requirements.txt b/dcs/src/test/pytests/test-requirements.txt
index 6a0ba66..c606808 100644
--- a/dcs/src/test/pytests/test-requirements.txt
+++ b/dcs/src/test/pytests/test-requirements.txt
@@ -6,6 +6,6 @@ mock>=1.0
 sphinx>=1.1.2,<1.2
 testrepository>=0.0.17
 testtools>=0.9.32
-configparser>=3.3.0r2
+configparser>=3.3.0
 xmlrunner>=1.7.4
 http://pyodbc.googlecode.com/files/pyodbc-3.0.7.zip


Mime
View raw message