From 113e0cdc06765b36a1ecb1a930f23fc0c7aa6587 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 4 Sep 2019 14:17:15 -0400 Subject: [PATCH 1/3] Pass the python version to tox. --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 9b2de2b226..388b9e0ae7 100644 --- a/tox.ini +++ b/tox.ini @@ -60,6 +60,7 @@ passenv = XDIST_WORKER_KEY_NAME XDIST_WORKER_SECURITY_GROUP XDIST_WORKER_SUBNET + PYTHON_VERSION deps = django111: -r requirements/edx/django.txt From 04025cd8c763237ab170b7a32a452b261eaddb5c Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 4 Sep 2019 14:32:31 -0400 Subject: [PATCH 2/3] Untar the correct venv as a part of preparing the xdist worker. --- scripts/xdist/prepare_xdist_nodes.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/xdist/prepare_xdist_nodes.sh b/scripts/xdist/prepare_xdist_nodes.sh index e6a1f6243d..8392d0aa59 100644 --- a/scripts/xdist/prepare_xdist_nodes.sh +++ b/scripts/xdist/prepare_xdist_nodes.sh @@ -23,6 +23,8 @@ do worker_reqs_cmd="ssh -o StrictHostKeyChecking=no jenkins@$ip 'git clone --branch master --depth 1 -q https://github.com/edx/edx-platform.git; cd edx-platform; git fetch -fq origin ${XDIST_GIT_REFSPEC}; git checkout -q ${XDIST_GIT_BRANCH}; + rm -rf $HOME/edx-venv; + tar -C $HOME -xf $HOME/edx-venv_clean-$PYTHON_VERSION.tar.gz; source ../edx-venv/bin/activate; pip install -q ${DJANGO_REQUIREMENT} -r requirements/edx/testing.txt; mkdir reports' & " From 666f1b748d2288fbfbc9fa1077fa7730e349270a Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 4 Sep 2019 15:00:05 -0400 Subject: [PATCH 3/3] Be explicit about the location of the home on the remote machine. --- scripts/xdist/prepare_xdist_nodes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/xdist/prepare_xdist_nodes.sh b/scripts/xdist/prepare_xdist_nodes.sh index 8392d0aa59..0029c75e6e 100644 --- a/scripts/xdist/prepare_xdist_nodes.sh +++ b/scripts/xdist/prepare_xdist_nodes.sh @@ -23,8 +23,8 @@ do worker_reqs_cmd="ssh -o StrictHostKeyChecking=no jenkins@$ip 'git clone --branch master --depth 1 -q https://github.com/edx/edx-platform.git; cd edx-platform; git fetch -fq origin ${XDIST_GIT_REFSPEC}; git checkout -q ${XDIST_GIT_BRANCH}; - rm -rf $HOME/edx-venv; - tar -C $HOME -xf $HOME/edx-venv_clean-$PYTHON_VERSION.tar.gz; + rm -rf /home/jenkins/edx-venv; + tar -C /home/jenkins -xf /home/jenkins/edx-venv_clean-${PYTHON_VERSION}.tar.gz; source ../edx-venv/bin/activate; pip install -q ${DJANGO_REQUIREMENT} -r requirements/edx/testing.txt; mkdir reports' & "