diff options
| author |   Carsten Koester <ckoester@cisco.com> | 2016-05-25 17:52:01 -0400 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2016-06-02 16:51:10 +0000 |
| commit | 5eb99d868051556dce3d509545d130971d74e1fa (patch) | |
| tree | b1bc04fad4c2bbb01e4e52f89b8ae4454618452f | |
| parent | c6d2b44a6c8cd5184f9b923889de6d4f2cc529ad (diff) | |
CSIT-114: Eliminate repeated download of PIP packages
Allow VirtualEnv to use existing system-wide packages if they already exist.
Change-Id: I6f39178d56e81affea0bee7b9065bef66712ddaa
Signed-off-by: Carsten Koester <ckoester@cisco.com>
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | bootstrap-multilink.sh | 2 | ||||
| -rwxr-xr-x | bootstrap-verify-perf.sh | 2 | ||||
| -rw-r--r-- | bootstrap-vpp-verify-weekly.sh | 2 | ||||
| -rwxr-xr-x | bootstrap.sh | 2 | ||||
| -rw-r--r-- | resources/libraries/python/SetupFramework.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/TrafficScriptExecutor.py | 2 |
7 files changed, 7 insertions, 7 deletions
@@ -2,7 +2,7 @@ - install virtualenv - generate environment using virtualenv: # cd $ROOT - # virtualenv env + # virtualenv --system-site-packages env # source env/bin/activate - install python requirements for this project by executing: # pip install -r requirements.txt diff --git a/bootstrap-multilink.sh b/bootstrap-multilink.sh index 950b29c894..1f7698b3e4 100755 --- a/bootstrap-multilink.sh +++ b/bootstrap-multilink.sh @@ -16,7 +16,7 @@ sudo apt-get -y install python-virtualenv -virtualenv env +virtualenv --system-site-packages env . env/bin/activate pip install -r requirements.txt diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 1f5acd3b2e..925e3a6b98 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -64,7 +64,7 @@ export PYTHONPATH=${CUR_DIR} sudo apt-get -y update sudo apt-get -y install libpython2.7-dev python-virtualenv -virtualenv env +virtualenv --system-site-packages env . env/bin/activate echo pip install diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index 5c94e89e05..90ff2b7cd0 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -142,7 +142,7 @@ if [ "$?" -ne "0" ]; then fi -virtualenv env +virtualenv --system-site-packages env . env/bin/activate echo pip install diff --git a/bootstrap.sh b/bootstrap.sh index 9c7db03b01..ee80247e01 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -184,7 +184,7 @@ if [ "$?" -ne "0" ]; then fi -virtualenv env +virtualenv --system-site-packages env . env/bin/activate echo pip install diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py index ddc5514c4a..b81a3065c6 100644 --- a/resources/libraries/python/SetupFramework.py +++ b/resources/libraries/python/SetupFramework.py @@ -102,7 +102,7 @@ def create_env_directory_at_node(node): ssh = SSH() ssh.connect(node) (ret_code, stdout, stderr) = ssh.exec_command( - 'cd {0} && rm -rf env && virtualenv env && . env/bin/activate && ' + 'cd {0} && rm -rf env && virtualenv --system-site-packages env && . env/bin/activate && ' 'pip install -r requirements.txt' .format(con.REMOTE_FW_DIR), timeout=100) if 0 != ret_code: diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py index fa4462393c..108b2b9815 100644 --- a/resources/libraries/python/TrafficScriptExecutor.py +++ b/resources/libraries/python/TrafficScriptExecutor.py @@ -52,7 +52,7 @@ class TrafficScriptExecutor(object): logger.trace("{}".format(timeout)) ssh = SSH() ssh.connect(node) - cmd = ("cd {}; virtualenv env && " + + cmd = ("cd {}; virtualenv --system-site-packages env && " + "export PYTHONPATH=${{PWD}}; " + ". ${{PWD}}/env/bin/activate; " + "resources/traffic_scripts/{} {}") \ |