Skip to content

Commit

Permalink
Merge pull request openedx#18377 from edx/estute/TE-2544
Browse files Browse the repository at this point in the history
consume env var to select tox env
  • Loading branch information
estute authored Jun 14, 2018
2 parents 58b9cb4 + f7df8ff commit 44945dc
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions scripts/generic-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,12 @@ END

}

if [[ $DJANGO_VERSION == '1.11' ]]; then
TOX="tox -r -e py27-django111 --"
elif [[ $DJANGO_VERSION == '1.10' ]]; then
TOX="tox -r -e py27-django110 --"
elif [[ $DJANGO_VERSION == '1.9' ]]; then
TOX="tox -r -e py27-django19 --"
if [ -n "${TOX_ENV}" ]; then
TOX="tox -r -e ${TOX_ENV} --"
else
TOX=""
fi

PAVER_ARGS="-v"
PARALLEL="--processes=-1"
export SUBSET_JOB=$JOB_NAME
Expand Down

0 comments on commit 44945dc

Please sign in to comment.