47d15ff1a8
Cleaned up a few more things about the testing configuration now that we've deployed Django 2.2 to production: * Go back to a single version of django-oauth-toolkit, tox doesn't need to vary it anymore * Go back to PyPI release of django-method-override * Remove no longer needed dependency on python-oauth2 (we already removed the package it was used by) * Update prepare_xdist_nodes.sh with new Django requirements file options
34 lines
1.1 KiB
Bash
34 lines
1.1 KiB
Bash
#!/bin/bash
|
|
set -e
|
|
|
|
echo "Spinning up xdist workers with pytest_worker_manager.py"
|
|
python scripts/xdist/pytest_worker_manager.py -a up -n ${XDIST_NUM_WORKERS} \
|
|
-ami ${XDIST_WORKER_AMI} \
|
|
-type ${XDIST_INSTANCE_TYPE} \
|
|
-s ${XDIST_WORKER_SUBNET} \
|
|
-sg ${XDIST_WORKER_SECURITY_GROUP} \
|
|
-key ${XDIST_WORKER_KEY_NAME} \
|
|
-iam ${XDIST_WORKER_IAM_PROFILE_ARN}
|
|
|
|
# Install the correct version of Django depending on which tox environment (if any) is in use
|
|
if [[ -z ${TOXENV+x} ]] || [[ ${TOXENV} == 'null' ]]; then
|
|
DJANGO_REQUIREMENT="requirements/edx/django.txt"
|
|
elif [[ ${TOXENV} == *'django30'* ]]; then
|
|
DJANGO_REQUIREMENT="requirements/edx/django30.txt"
|
|
fi
|
|
|
|
ip_list=$(<pytest_worker_ips.txt)
|
|
for ip in $(echo $ip_list | sed "s/,/ /g")
|
|
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};
|
|
scripts/xdist/setup_worker.sh -p $PYTHON_VERSION -d $DJANGO_REQUIREMENT' & "
|
|
|
|
cmd=$cmd$worker_reqs_cmd
|
|
done
|
|
cmd=$cmd"wait"
|
|
|
|
echo "Executing commmand: $cmd"
|
|
eval $cmd
|