[tor-commits] [tor/master] ci: Add tracing build to Gitlab CI
ahf at torproject.org
ahf at torproject.org
Wed Aug 26 22:16:23 UTC 2020
commit 20a990cea3be353357723fa03b824dc9cfc6dd8c
Author: David Goulet <dgoulet at torproject.org>
Date: Tue Aug 25 10:04:25 2020 -0400
ci: Add tracing build to Gitlab CI
Signed-off-by: David Goulet <dgoulet at torproject.org>
---
.gitlab-ci.yml | 12 ++++++++++++
changes/ticket40038 | 3 +++
scripts/ci/ci-driver.sh | 5 +++++
3 files changed, 20 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 176c71f8f0..48bcf6b000 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,6 +92,7 @@ variables:
- if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/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://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
+ - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi
# Minmal check on debian: just make, make check.
#
@@ -155,3 +156,14 @@ debian-integration:
STEM: "yes"
script:
- ./scripts/ci/ci-driver.sh
+
+#####
+# Tracing build on Debian stable.
+debian-tracing:
+ image: debian:stable
+ <<: *debian-template
+ variables:
+ TRACING: "yes"
+ CHECK: "no"
+ script:
+ - ./scripts/ci/ci-driver.sh
diff --git a/changes/ticket40038 b/changes/ticket40038
new file mode 100644
index 0000000000..df648f7a7a
--- /dev/null
+++ b/changes/ticket40038
@@ -0,0 +1,3 @@
+ o Testing (CI):
+ - Build tracing configure option into our CI. Closes ticket 40038.
+
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 527bba82e5..cd91a91bbf 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}"
RUST="${RUST:-no}"
DOXYGEN="${DOXYGEN:-no}"
ASCIIDOC="${ASCIIDOC:-no}"
+TRACING="${TRACING:-no}"
# Options for which tests to run. All should be yes/no.
CHECK="${CHECK:-yes}"
@@ -191,6 +192,7 @@ yes_or_no COVERAGE
yes_or_no RUST
yes_or_no DOXYGEN
yes_or_no ASCIIDOC
+yes_or_no TRACING
yes_or_no RUN_STAGE_CONFIGURE
yes_or_no RUN_STAGE_BUILD
@@ -241,6 +243,9 @@ fi
if [[ "$ASCIIDOC" != "yes" ]]; then
configure_options+=("--disable-asciidoc")
fi
+if [[ "$TRACING" == "yes" ]]; then
+ configure_options+=("--enable-tracing-instrumentation-lttng")
+fi
#############################################################################
# Tell the user about our versions of different tools and packages.
More information about the tor-commits
mailing list