Removed java-hadoop test and py-vtdb , PYTHONPATH

Signed-off-by: Arindam Nayak <[email protected]>

.dockerignore

@@ -6,7 +6,6 @@ java/*/bin
 php/vendor
 releases
 /dist/
-/py-vtdb/
 /vthook/
 /bin/
 /vtdataroot/

.gitignore

@@ -78,7 +78,6 @@ releases
 .vagrant
 
 /dist/
-/py-vtdb
 /vthook/
 /bin/
 /vtdataroot/

build.env

@@ -32,7 +32,6 @@ mkdir -p "$VTDATAROOT"
 
 # Set up required soft links.
 # TODO(mberlin): Which of these can be deleted?
-ln -snf "$PWD/py" py-vtdb
 ln -snf "$PWD/go/vt/zkctl/zksrv.sh" bin/zksrv.sh
 ln -snf "$PWD/test/vthook-test.sh" vthook/test.sh
 ln -snf "$PWD/test/vthook-test_backup_error" vthook/test_backup_error

dev.env

@@ -24,30 +24,6 @@ source ./build.env
 
 export VTPORTSTART=15000
 
-# Add all site-packages or dist-packages directories below $VTROOT/dist to $PYTHONPATH.
-BACKUP_IFS="$IFS"
-IFS="
-"
-# Note that the escaped ( ) around the -or expression are important.
-# Otherwise, the -print would match *all* files.
-for pypath in $(find "$VTROOT/dist" \( -name site-packages -or -name dist-packages \) -print); do
-  PYTHONPATH=$(prepend_path "$PYTHONPATH" "$pypath")
-done
-IFS="$BACKUP_IFS"
-
-PYTHONPATH=$(prepend_path "$PYTHONPATH" "$VTROOT/py-vtdb")
-PYTHONPATH=$(prepend_path "$PYTHONPATH" "$VTROOT/dist/selenium")
-PYTHONPATH=$(prepend_path "$PYTHONPATH" "$VTROOT/test")
-PYTHONPATH=$(prepend_path "$PYTHONPATH" "$VTROOT/test/cluster/sandbox")
-export PYTHONPATH
-
-# Ensure bootstrap.sh uses python2 on systems which default to python3.
-command -v python2 >/dev/null && PYTHON=python2 || PYTHON=python
-export PYTHON
-command -v pip2 >/dev/null && PIP=pip2 || PIP=pip
-export PIP
-command -v virtualenv2 >/dev/null && VIRTUALENV=virtualenv2 || VIRTUALENV=virtualenv
-export VIRTUALENV
 
 # Add chromedriver to path for Selenium tests.
 PATH=$(prepend_path "$PATH" "$VTROOT/dist/chromedriver")

docker/bootstrap/Dockerfile.common

@@ -40,7 +40,6 @@ RUN mkdir -p /vt/src/vitess.io/vitess/dist && \
 ENV VTROOT /vt/src/vitess.io/vitess
 ENV VTDATAROOT /vt/vtdataroot
 ENV VTPORTSTART 15000
-ENV PYTHONPATH $VTROOT/dist/grpc/usr/local/lib/python2.7/site-packages:$VTROOT/dist/py-mock-1.0.1/lib/python2.7/site-packages:$VTROOT/py-vtdb:$VTROOT/dist/selenium/lib/python2.7/site-packages
 ENV PATH $VTROOT/bin:$VTROOT/dist/maven/bin:$VTROOT/dist/chromedriver:$PATH
 ENV USER vitess
 

docker/test/run.sh

@@ -165,14 +165,13 @@ bashcmd=""
 if [[ -z "$existing_cache_image" ]]; then
 
   # Construct "cp" command to copy the source code.
-  bashcmd=$(append_cmd "$bashcmd" "cp -R /tmp/src/!(vtdataroot|dist|bin|lib|vthook|py-vtdb) . && cp -R /tmp/src/.git .")
+  bashcmd=$(append_cmd "$bashcmd" "cp -R /tmp/src/!(vtdataroot|dist|bin|lib|vthook) . && cp -R /tmp/src/.git .")
 
 fi
 
 # Reset the environment if this was an old bootstrap. We can detect this from VTTOP presence.
 bashcmd=$(append_cmd "$bashcmd" "export VTROOT=/vt/src/vitess.io/vitess")
 bashcmd=$(append_cmd "$bashcmd" "export VTDATAROOT=/vt/vtdataroot")
-bashcmd=$(append_cmd "$bashcmd" "export PYTHONPATH=/vt/src/vitess.io/vitess/dist/grpc/usr/local/lib/python2.7/site-packages:/vt/src/vitess.io/vitess/dist/py-mock-1.0.1/lib/python2.7/site-packages:/vt/src/vitess.io/vitess/py-vtdb:/vt/src/vitess.io/vitess/dist/selenium/lib/python2.7/site-packages")
 
 bashcmd=$(append_cmd "$bashcmd" "mkdir -p dist; mkdir -p bin; mkdir -p lib; mkdir -p vthook")
 bashcmd=$(append_cmd "$bashcmd" "rm -rf /vt/dist; ln -s /vt/src/vitess.io/vitess/dist /vt/dist")