From e6bfc2a4eab575364ce182f0da1828500654c299 Mon Sep 17 00:00:00 2001 From: Jim Newsome Date: Thu, 24 Oct 2024 09:44:47 -0500 Subject: [PATCH 1/2] Re-format CHUTNEY installation block into multiple lines We're about to add a few more steps, which would make the single-line format a bit unwieldy. --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f4a9b7af5..7af5aa873d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,11 @@ variables: # TODO: This next line should not be debian-only. - if [ "$STEM" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/network-health/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - | + if [ "$CHUTNEY" = yes ]; then + git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git + export CHUTNEY_PATH="$(pwd)/chutney" + fi - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi # Minimal check on debian: just make, make check. @@ -270,4 +274,4 @@ rust-latest: - rustup show - cargo clippy --all-features --all-targets -- -D warnings after_script: - - cargo clean \ No newline at end of file + - cargo clean From 09e91e2f5691c5770ff88a58557cc5eca054ab93 Mon Sep 17 00:00:00 2001 From: Jim Newsome Date: Thu, 24 Oct 2024 09:53:19 -0500 Subject: [PATCH 2/2] Use pip to install chutney's python dependencies --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7af5aa873d..82176a1bfd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,6 +110,10 @@ variables: if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/core/chutney.git export CHUTNEY_PATH="$(pwd)/chutney" + # Have pip install chutney's python dependencies by installing chutney + # itself. + apt-get install python3-pip + pip3 install --user ./chutney fi - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi