Verified Commit 7a24127c authored by Jim Newsome's avatar Jim Newsome
Browse files

Fix geoip path

parent 733a0d21

.gitlab-ci.yml

+4 −1
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ tornettools-stage: 
  dependencies:

    - build-tornettools

    - build-tor

  cache:

    key: $CI_JOB_NAME-$DATA_MONTH

    paths: jobs/network-data

  script:

    - apt-get install -y bsdmainutils python3 python3-pip wget xz-utils

    - export DATA_DAYS=$(cal -d $DATA_MONTH | awk 'NF {DAYS = $NF}; END {print DAYS}')
@@ -131,7 +134,7 @@ tornettools-stage: 
    - 'wget -O bandwidth-$DATA_MONTH.csv "https://metrics.torproject.org/bandwidth.csv?start=$DATA_MONTH-01&end=$DATA_MONTH-$DATA_DAYS"'

    - pip3 install -r $CI_PROJECT_DIR/jobs/src/tornettools/requirements.txt

    - pip3 install -I $CI_PROJECT_DIR/jobs/src/tornettools

    - tornettools stage consensuses-$DATA_MONTH server-descriptors-$DATA_MONTH userstats-relay-country.csv --onionperf_data_path onionperf-$DATA_MONTH --bandwidth_data_path bandwidth-$DATA_MONTH.csv --geoip_path $CI_PROJECT_DIR/opt/tor/share/tor/geoip

    - tornettools stage consensuses-$DATA_MONTH server-descriptors-$DATA_MONTH userstats-relay-country.csv --onionperf_data_path onionperf-$DATA_MONTH --bandwidth_data_path bandwidth-$DATA_MONTH.csv --geoip_path $CI_PROJECT_DIR/jobs/opt/tor/share/tor/geoip

  artifacts:

    paths:

      - jobs/network-data/*.json