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

Save tornettools parsed output as artifacts

parent d048bd47
......@@ -245,65 +245,53 @@ run-sim:
- PARALLELISM=20
- tornettools simulate -s $CI_PROJECT_DIR/jobs/opt/shadow/bin/shadow -a "--use-cpu-pinning=true --interpose-method=preload -p $PARALLELISM --template-directory=shadow.data.template" $CI_PROJECT_DIR/jobs/tornet
# FIXME: parse and plot, since raw simulator output is too large.
# The raw results are too large to save as an artifact.
# Parse the logs and save the results of that.
# https://gitlab.torproject.org/tpo/tpa/team/-/issues/40340
- pip3 install -r jobs/src/tgen/tools/requirements.txt
- pip3 install -I jobs/src/tgen/tools
- pip3 install -r jobs/src/oniontrace/tools/requirements.txt
- pip3 install -I jobs/src/oniontrace/tools
- mkdir -p jobs/plots
- cd jobs/plots
- tornettools parse $CI_PROJECT_DIR/jobs/tornet
- tornettools plot $CI_PROJECT_DIR/jobs/tornet
- grep -E 'WARN|ERR' $CI_PROJECT_DIR/jobs/tornet/shadow.log > $CI_PROJECT_DIR/jobs/tornet/shadow.log.warn
timeout: 24h
artifacts:
paths:
# FIXME: parse and plot, since raw simulator output is too large.
# https://gitlab.torproject.org/tpo/tpa/team/-/issues/40340
# - jobs/tornet
- jobs/plots
- jobs/tornet/**.json.xz
- jobs/tornet/**.json
- jobs/tornet/shadow.log.warn
exclude:
- jobs/tornet/conf/atlas*
when: always
# FIXME: https://gitlab.torproject.org/tpo/tpa/team/-/issues/40340
#graph-sim:
# stage: post-process
# needs:
# - build-oniontrace
# - build-tgen
# - build-tornettools
# - tornettools-generate
# - run-sim
# # See if we can iterate on this stage while simulation itself is broken.
# # Will it use artifacts from previous run?
# when: always
# cache:
# key: $CI_JOB_NAME
# paths:
# - job-cache
# script:
# - apt-get install -y python3 python3-pip
# - pip3 install -r jobs/src/tornettools/requirements.txt
# - pip3 install -I jobs/src/tornettools
# - pip3 install -r jobs/src/tgen/tools/requirements.txt
# - pip3 install -I jobs/src/tgen/tools
# - pip3 install -r jobs/src/oniontrace/tools/requirements.txt
# - pip3 install -I jobs/src/oniontrace/tools
# - mkdir -p jobs/plots
# - cd jobs/plots
# - tornettools parse $CI_PROJECT_DIR/jobs/tornet
# - tornettools plot $CI_PROJECT_DIR/jobs/tornet
# artifacts:
# paths:
# - jobs/plots
graph-sim:
stage: post-process
needs:
- build-tornettools
- run-sim
when: always
cache:
key: $CI_JOB_NAME
paths:
- job-cache
script:
- apt-get install -y python3 python3-pip
- pip3 install -r jobs/src/tornettools/requirements.txt
- pip3 install -I jobs/src/tornettools
- mkdir -p jobs/plots
- cd jobs/plots
- tornettools parse $CI_PROJECT_DIR/jobs/tornet
- tornettools plot $CI_PROJECT_DIR/jobs/tornet
artifacts:
paths:
- jobs/plots
pages:
stage: deploy
needs:
# FIXME: https://gitlab.torproject.org/tpo/tpa/team/-/issues/40340
# - graph-sim
- run-sim
- graph-sim
script:
- mkdir public
- mv jobs/plots/*.pdf public
......
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