Try avoiding some of the sudo'ing

This commit is contained in:
Jean-Paul Calderone 2019-04-04 12:52:35 -04:00
parent 2896370880
commit 4d15504e4a
2 changed files with 7 additions and 12 deletions

View File

@ -60,6 +60,7 @@ jobs:
debian-9: &DEBIAN
docker:
- image: "tahoelafsci/debian:9"
user: "nobody"
environment: &UTF_8_ENVIRONMENT
# Tell Hypothesis which configuration we want it to use.
@ -84,14 +85,10 @@ jobs:
steps:
- "checkout"
- run:
name: "Fix permissions"
command: |
chown --recursive nobody:nogroup /tmp/project
- run: &SETUP_VIRTUALENV
name: "Setup virtualenv"
command: |
sudo --set-home -u nobody /tmp/project/.circleci/setup-virtualenv.sh \
/tmp/project/.circleci/setup-virtualenv.sh \
"/tmp/venv" \
"/tmp/project" \
"${WHEELHOUSE_PATH}" \

View File

@ -47,13 +47,11 @@ fi
#
# Send the output directly to a file because transporting the binary subunit2
# via tox and then scraping it out is hideous and failure prone.
sudo \
SUBUNITREPORTER_OUTPUT_PATH="${SUBUNIT2}" \
TAHOE_LAFS_TRIAL_ARGS="--reporter=subunitv2-file --rterrors" \
PIP_NO_INDEX="1" \
--set-home \
--user nobody \
${BOOTSTRAP_VENV}/bin/tox \
export SUBUNITREPORTER_OUTPUT_PATH="${SUBUNIT2}"
export TAHOE_LAFS_TRIAL_ARGS="--reporter=subunitv2-file --rterrors"
export PIP_NO_INDEX="1"
${BOOTSTRAP_VENV}/bin/tox \
-c ${PROJECT_ROOT}/tox.ini \
--workdir /tmp/tahoe-lafs.tox \
-e "${TAHOE_LAFS_TOX_ENVIRONMENT}" \