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

Bump shadow and tornettools versions

parent 9ca14ff9
Pipeline #12483 passed with stages
in 281 minutes and 59 seconds
...@@ -34,7 +34,7 @@ build-shadow: ...@@ -34,7 +34,7 @@ build-shadow:
variables: variables:
REPO: 'https://github.com/shadow/shadow.git' REPO: 'https://github.com/shadow/shadow.git'
BRANCH: main BRANCH: main
COMMIT: b507cc1ed0fec74a0d02448401578f8b07add825 COMMIT: 2dbbeddc200e681b03b4cd010b925602434baea5
stage: build stage: build
cache: cache:
key: $CI_JOB_NAME key: $CI_JOB_NAME
...@@ -131,7 +131,7 @@ build-tornettools: ...@@ -131,7 +131,7 @@ build-tornettools:
variables: variables:
REPO: 'https://github.com/shadow/tornettools.git' REPO: 'https://github.com/shadow/tornettools.git'
BRANCH: main BRANCH: main
COMMIT: d9a1e0aa47434768071ace25e9fd6bf286c4d946 COMMIT: 3daa27316d477a0a069289c267a13b97058900fb
stage: build stage: build
cache: cache:
key: $CI_JOB_NAME key: $CI_JOB_NAME
...@@ -181,7 +181,7 @@ tornettools-stage: ...@@ -181,7 +181,7 @@ tornettools-stage:
- mkdir -p $CI_PROJECT_DIR/jobs/network-data - mkdir -p $CI_PROJECT_DIR/jobs/network-data
- cd $CI_PROJECT_DIR/jobs/network-data - cd $CI_PROJECT_DIR/jobs/network-data
- git clone --depth=1 -b $TMODEL_BRANCH $TMODEL_REPO tmodel - git clone --depth=1 -b $TMODEL_BRANCH $TMODEL_REPO tmodel
- 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 $CI_PROJECT_DIR/jobs/network-data/tmodel --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: artifacts:
paths: paths:
- jobs/network-data/*.json - jobs/network-data/*.json
...@@ -219,7 +219,7 @@ run-sim: ...@@ -219,7 +219,7 @@ run-sim:
- pip3 install -r jobs/src/tornettools/requirements.txt - pip3 install -r jobs/src/tornettools/requirements.txt
- pip3 install -I jobs/src/tornettools - pip3 install -I jobs/src/tornettools
- for trial in `seq 3`; do tornettools generate jobs/network-data/relayinfo_staging_*.json jobs/network-data/userinfo_staging_*.json jobs/network-data/tmodel --network_scale $SCALE --prefix jobs/tornet/$trial --tor jobs/opt/tor/bin/tor --torgencert jobs/opt/tor/bin/tor-gencert --process_scale $PROCESS_SCALE; done - for trial in `seq 3`; do tornettools generate jobs/network-data/relayinfo_staging_*.json jobs/network-data/userinfo_staging_*.json jobs/network-data/networkinfo_staging.gml jobs/network-data/tmodel --network_scale $SCALE --prefix jobs/tornet/$trial --tor jobs/opt/tor/bin/tor --torgencert jobs/opt/tor/bin/tor-gencert --process_scale $PROCESS_SCALE; done
# Run simulation # Run simulation
- apt-get install -y libevent-2.1-7 libssl1.1 zlib1g libglib2.0-0 libigraph0v5 libprocps8 stow sysstat python3 python3-pip - apt-get install -y libevent-2.1-7 libssl1.1 zlib1g libglib2.0-0 libigraph0v5 libprocps8 stow sysstat python3 python3-pip
......
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