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

Move process_scale parameter to tornettools generate stage

parent a8f7e092
......@@ -148,8 +148,6 @@ 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
......@@ -176,7 +174,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 --process_scale $PROCESS_SCALE
- 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
artifacts:
paths:
- jobs/network-data/*.json
......@@ -184,6 +182,8 @@ tornettools-stage:
tornettools-generate:
variables:
SCALE: '0.10'
# Needs to be 1.0 when enabling guards.
PROCESS_SCALE: '1.0'
TMODEL_REPO: 'https://github.com/tmodel-ccs2018/tmodel-ccs2018.github.io.git'
TMODEL_BRANCH: master
stage: generate-sim
......@@ -201,7 +201,7 @@ tornettools-generate:
- git clone --depth=1 -b $TMODEL_BRANCH $TMODEL_REPO jobs/src/tmodel
- pip3 install -r jobs/src/tornettools/requirements.txt
- pip3 install -I jobs/src/tornettools
- tornettools generate jobs/network-data/relayinfo_staging_*.json jobs/network-data/userinfo_staging_*.json jobs/src/tmodel --network_scale $SCALE --prefix jobs/tornet --tor jobs/opt/tor/bin/tor --torgencert jobs/opt/tor/bin/tor-gencert
- tornettools generate jobs/network-data/relayinfo_staging_*.json jobs/network-data/userinfo_staging_*.json jobs/src/tmodel --network_scale $SCALE --prefix jobs/tornet --tor jobs/opt/tor/bin/tor --torgencert jobs/opt/tor/bin/tor-gencert --process_scale $PROCESS_SCALE
artifacts:
paths:
- jobs/tornet
......
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