From e1f4604e662b3e63d0631007ae54e464504b921a Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 17 Jul 2018 11:58:36 -0400 Subject: [PATCH 1/2] Recreate virtualenv from scratch when syncing WPT --- etc/ci/buildbot_steps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 945311cfbd3..7d9a7cfd3d1 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -147,6 +147,7 @@ linux-nightly: - ./mach test-perf - python3 ./etc/ci/performance/download_buildbot_timings.py --verbose - aws s3 sync --size-only --acl public-read ./etc/ci/performance/output s3://servo-perf + - rm -rf ./python/_virtualenv - ./etc/ci/update-wpt-checkout fetch-and-update-expectations - ./etc/ci/update-wpt-checkout open-pr - ./etc/ci/update-wpt-checkout cleanup From 8084cf882d2c4f7249d1b7479dd75b9758050dc6 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 17 Jul 2018 12:03:13 -0400 Subject: [PATCH 2/2] Revert f37699d68212ad3f1e099651b2b5e05508941b7f to fix perf test. --- etc/ci/performance/test_perf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/ci/performance/test_perf.sh b/etc/ci/performance/test_perf.sh index 61de699a828..306cc659e7c 100755 --- a/etc/ci/performance/test_perf.sh +++ b/etc/ci/performance/test_perf.sh @@ -39,8 +39,8 @@ fi # Make sure we're running with an up-to-date warc test repo git -C ${WARC_DIR} pull --progress -virtualenv venv ./perf-venv --python="$(which python3)" -PS1="" source ./perf-venv/bin/activate +virtualenv venv --python="$(which python3)" +PS1="" source venv/bin/activate # `PS1` must be defined before activating virtualenv pip install \ "boto3>=1.4.0" \