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

Try passing simulation config through cache

parent e6f9b7cf
......@@ -192,9 +192,16 @@ tornettools-generate:
- build-tornettools
- build-tor
cache:
key: $CI_JOB_NAME
paths:
- job-cache
- key: $CI_JOB_NAME
paths:
- job-cache
# Too large to be an artifact; use cache instead.
# See https://gitlab.torproject.org/tpo/tpa/team/-/issues/40340
# TODO: should incorporate commit ID and all variables in the cache key to
# avoid potentially using stale cache.
- key: tornettools-generate-tornet
paths:
- jobs/tornet
script:
- apt-get install -y bsdmainutils libevent-dev libssl-dev python3 python3-pip wget xz-utils zlib1g-dev
- mkdir -p jobs/src
......@@ -202,6 +209,8 @@ tornettools-generate:
- 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 --process_scale $PROCESS_SCALE
# Log directory sizes for debugging
- du
artifacts:
paths:
- jobs/tornet
......@@ -218,9 +227,14 @@ run-sim:
- build-tornettools
- tornettools-generate
cache:
key: $CI_JOB_NAME
paths:
- job-cache
- key: $CI_JOB_NAME
paths:
- job-cache
# Too large to be an artifact; use cache instead.
# See https://gitlab.torproject.org/tpo/tpa/team/-/issues/40340
- key: tornettools-generate-tornet
paths:
- jobs/tornet
script:
- apt-get install -y libevent-2.1-7 libssl1.1 zlib1g libglib2.0-0 libigraph0v5 libprocps8 stow sysstat python3 python3-pip
- pip3 install -r jobs/src/tornettools/requirements.txt
......@@ -260,6 +274,9 @@ run-sim:
- tornettools parse $CI_PROJECT_DIR/jobs/tornet
- grep -E 'WARN|ERR' $CI_PROJECT_DIR/jobs/tornet/shadow.log > $CI_PROJECT_DIR/jobs/tornet/shadow.log.warn
# Log directory sizes for debugging
- du
timeout: 24h
artifacts:
paths:
......
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