Revert "GS Cache: using vpython"
This reverts commit f092e0629fbb3d2422c381324d056dadf035bac3.
The change to be reverted breaks provision.
BUG=chromium:840975,chromium:824580
TEST=None
Change-Id: I9002c4cf0026fee49b522527e626ec46c14c8b87
Reviewed-on: https://chromium-review.googlesource.com/1050749
Reviewed-by: Congbin Guo <guocb@chromium.org>
Reviewed-by: Ningning Xia <nxia@chromium.org>
Tested-by: Congbin Guo <guocb@chromium.org>
Commit-Queue: Congbin Guo <guocb@chromium.org>
diff --git a/bin/gs_archive_server b/bin/gs_archive_server
index 06cd7ec..17de3e4 100755
--- a/bin/gs_archive_server
+++ b/bin/gs_archive_server
@@ -3,16 +3,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# Run Google Storage archive server from inside virtual environment.
+# Run a archive server of Google Storage inside virtualenv
set -eu
-readonly bindir=$(dirname -- "$(readlink -e -- "$0")")
-readonly homedir=$(cd "$bindir"/../gs_cache; pwd)
-export PYTHONPATH=$homedir
-# Run the server, or run tests
-if [[ $(basename "$0") == gs_archive_server_test ]]; then
- exec vpython -vpython-spec $homedir/.vpython -m pytest \
- "$homedir"/gs_archive_server_test.py "$@"
-else
- exec vpython -vpython-spec $homedir/.vpython -m gs_archive_server "$@"
-fi
+original=$(pwd)
+cd -- "$(dirname -- "$(readlink -e -- "$0")")"
+. ./find_virtualenv.sh
+cd -- "$original"
+
+exec_python_module gs_archive_server.gs_archive_server "$@"
diff --git a/bin/gs_archive_server_test b/bin/gs_archive_server_test
deleted file mode 120000
index d349ad7..0000000
--- a/bin/gs_archive_server_test
+++ /dev/null
@@ -1 +0,0 @@
-gs_archive_server
\ No newline at end of file
diff --git a/gs_cache/.vpython b/gs_cache/.vpython
deleted file mode 100644
index 95ff3f5..0000000
--- a/gs_cache/.vpython
+++ /dev/null
@@ -1,66 +0,0 @@
-python_version: "2.7"
-
-wheel: <
- name: "infra/python/wheels/attrs-py2_py3"
- version: "version:17.4.0"
->
-
-wheel: <
- name: "infra/python/wheels/backports_functools_lru_cache-py2_py3"
- version: "version:1.5"
->
-
-wheel: <
- name: "infra/python/wheels/cheroot-py2_py3"
- version: "version:6.2.4"
->
-
-wheel: <
- name: "infra/python/wheels/cherrypy-py2_py3"
- version: "version:14.2.0"
->
-
-wheel: <
- name: "infra/python/wheels/funcsigs-py2_py3"
- version: "version:1.0.2"
->
-
-wheel: <
- name: "infra/python/wheels/more-itertools-py2_py3"
- version: "version:4.1.0"
->
-
-wheel: <
- name: "infra/python/wheels/pluggy-py2_py3"
- version: "version:0.6.0"
->
-
-wheel: <
- name: "infra/python/wheels/portend-py2_py3"
- version: "version:2.2"
->
-
-wheel: <
- name: "infra/python/wheels/py-py2_py3"
- version: "version:1.5.3"
->
-
-wheel: <
- name: "infra/python/wheels/pytest-py2_py3"
- version: "version:3.5.0"
->
-
-wheel: <
- name: "infra/python/wheels/pytz-py2_py3"
- version: "version:2018.4"
->
-
-wheel: <
- name: "infra/python/wheels/six-py2_py3"
- version: "version:1.11.0"
->
-
-wheel: <
- name: "infra/python/wheels/tempora-py2_py3"
- version: "version:1.11"
->
diff --git a/gs_cache/chromite b/gs_cache/chromite
deleted file mode 120000
index d780b88..0000000
--- a/gs_cache/chromite
+++ /dev/null
@@ -1 +0,0 @@
-../../../../chromite
\ No newline at end of file
diff --git a/venv/gs_archive_server/__init__.py b/venv/gs_archive_server/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/venv/gs_archive_server/__init__.py
diff --git a/gs_cache/gs_archive_server.py b/venv/gs_archive_server/gs_archive_server.py
similarity index 100%
rename from gs_cache/gs_archive_server.py
rename to venv/gs_archive_server/gs_archive_server.py
diff --git a/gs_cache/gs_archive_server_test.py b/venv/gs_archive_server/gs_archive_server_test.py
similarity index 97%
rename from gs_cache/gs_archive_server_test.py
rename to venv/gs_archive_server/gs_archive_server_test.py
index c6047f5..56cf478 100644
--- a/gs_cache/gs_archive_server_test.py
+++ b/venv/gs_archive_server/gs_archive_server_test.py
@@ -13,8 +13,8 @@
import cherrypy
from cherrypy.test import helper
-import gs_archive_server
from chromite.lib import gs
+from gs_archive_server import gs_archive_server
_DIR = '/gs_archive_server_test'
# some REAL files and info on Google Storage