CI: Turn on stem with 044 and later.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b920c0531d08bab5c3dbe48b3014535..c77e78764d0fb83fb0b8484525b8ebeb1aff4377 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
     paths:
       - artifacts/
 
+# This template
 .apt-template: &apt-template |
       export LC_ALL=C.UTF-8
       echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
     - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
     CHECK: "no"
     CHUTNEY: "yes"
-    # STEM: "yes" -- currently failing on <044.
+    STEM: "yes"
   script:
     - ./scripts/ci/ci-driver.sh

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40ae3781501cd33583f85f71ca399875..527bba82e5dd126f12dff032c5ae3fb1a663e2ad 100755 (executable)
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
     0.3.*)
         TOR_VER_AT_LEAST_043=no
+        TOR_VER_AT_LEAST_044=no
         ;;
     0.4.[012].*)
         TOR_VER_AT_LEAST_043=no
+        TOR_VER_AT_LEAST_044=no
+        ;;
+    0.4.3.*)
+        TOR_VER_AT_LEAST_043=yes
+        TOR_VER_AT_LEAST_044=no
         ;;
     *)
         TOR_VER_AT_LEAST_043=yes
+        TOR_VER_AT_LEAST_044=yes
         ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
    start_section "Stem"
-   # XXXX This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
-         python3 "${STEM_PATH}/run_tests.py" \
-         --tor src/app/tor \
-         --integ --test control.controller \
-         --test control.base_controller \
-         --test process \
-         --log TRACE \
-         --log-file stem.log ; then
-       hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+     # XXXX This shold probably be part some test-stem make target.
+     if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+           python3 "${STEM_PATH}/run_tests.py" \
+           --tor src/app/tor \
+           --integ --test control.controller \
+           --test control.base_controller \
+           --test process \
+           --log TRACE \
+           --log-file stem.log ; then
+         hooray "Stem tests have succeeded"
+     else
        error "Stem output:"
        runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
        runcmd grep -v "SocketClosed" stem.log | tail -1000
        FAILED_TESTS="${FAILED_TESTS} stem"
+     fi
+   else
+       skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
    fi
    end_section "Stem"
 fi