From 7cd387bf5bf003ebfa4f5d14725e93717d15931f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 14 Jun 2018 16:00:02 -0400 Subject: [PATCH] Specify tox environment with an env var This will make it easier to override. --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 258576048..f51abc30a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,6 +38,8 @@ jobs: # Tell the C runtime things about character encoding (mainly to do with # filenames and argv). - LANG: "en_US.UTF-8" + # Select a tox environment to run for this job. + - TAHOE_LAFS_TOX_ENVIRONMENT: "coverage" steps: - run: @@ -95,7 +97,7 @@ jobs: # Also run with /tmp as a workdir because the non-root user won't # be able to create the tox working filesystem state in the source # checkout because it is owned by root. - sudo --set-home -u nobody /tmp/tests/bin/tox -c /tmp/project/tox.ini --workdir /tmp -e coverage + sudo --set-home -u nobody /tmp/tests/bin/tox -c /tmp/project/tox.ini --workdir /tmp -e ${TAHOE_LAFS_TOX_ENVIRONMENT} - store_artifacts: &STORE_ARTIFACTS # Despite passing --workdir /tmp to tox above, it still runs trial