Verified Commit a8f7e092 authored by Jim Newsome's avatar Jim Newsome
Browse files

Enable entry guards

parent 08dd3cb3
......@@ -148,6 +148,8 @@ build-tornettools:
tornettools-stage:
variables:
DATA_MONTH: 2020-11
# Needs to be 1.0 when enabling guards.
PROCESS_SCALE: 1.0
stage: stage-sim
needs:
- build-tornettools
......@@ -174,7 +176,7 @@ tornettools-stage:
- pip3 install -I $CI_PROJECT_DIR/jobs/src/tornettools
- mkdir -p $CI_PROJECT_DIR/jobs/network-data
- cd $CI_PROJECT_DIR/jobs/network-data
- tornettools stage $CI_PROJECT_DIR/jobs/cache/metrics/consensuses-$DATA_MONTH $CI_PROJECT_DIR/jobs/cache/metrics/server-descriptors-$DATA_MONTH $CI_PROJECT_DIR/jobs/cache/metrics/userstats-relay-country.csv --onionperf_data_path $CI_PROJECT_DIR/jobs/cache/metrics/onionperf-$DATA_MONTH --bandwidth_data_path $CI_PROJECT_DIR/jobs/cache/metrics/bandwidth-$DATA_MONTH.csv --geoip_path $CI_PROJECT_DIR/jobs/opt/tor/share/tor/geoip
- tornettools stage $CI_PROJECT_DIR/jobs/cache/metrics/consensuses-$DATA_MONTH $CI_PROJECT_DIR/jobs/cache/metrics/server-descriptors-$DATA_MONTH $CI_PROJECT_DIR/jobs/cache/metrics/userstats-relay-country.csv --onionperf_data_path $CI_PROJECT_DIR/jobs/cache/metrics/onionperf-$DATA_MONTH --bandwidth_data_path $CI_PROJECT_DIR/jobs/cache/metrics/bandwidth-$DATA_MONTH.csv --geoip_path $CI_PROJECT_DIR/jobs/opt/tor/share/tor/geoip --process_scale $PROCESS_SCALE
artifacts:
paths:
- jobs/network-data/*.json
......@@ -232,6 +234,9 @@ run-sim:
- echo "Log [sim]debug file $CI_PROJECT_DIR/jobs/tornet/tor-trace.txt" >> jobs/tornet/conf/tor.exitonly.torrc
- 'sed -i ''s/stop_time:.*/stop_time: ''"$SIM_TIME/" jobs/tornet/shadow.config.yaml'
# Enable guards. See
# https://gitlab.torproject.org/jnewsome/sponsor-61-sims/-/issues/5
- 'sed -i ''s/UseEntryGuards:.*/UseEntryGuards: 1/'' jobs/tornet/conf/tor.client.torrc'
- ulimit -c unlimited
- $CI_PROJECT_DIR/monitor.sh $CI_PROJECT_DIR/jobs/tornet &
- disown
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment