August 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Add a chutney mode to travis.yml.
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 63325c05964ca5906aad4b51a53a5dc471fc7347 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 27 07:59:39 2019 -0500 Add a chutney mode to travis.yml. --- .travis.yml | 8 +++++++- changes/chutney_ci | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6727923d..a8ad1f122 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,10 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with … [View More]distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + # We also try running a hardened clang build with chutney on Linux. + - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + compiler: clang + os: linux ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -142,7 +146,8 @@ install: - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi - ## + ## If we're running chutney, install it. + - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi @@ -155,6 +160,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi diff --git a/changes/chutney_ci b/changes/chutney_ci new file mode 100644 index 000000000..b17d58732 --- /dev/null +++ b/changes/chutney_ci @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis configuration now uses Chutney to run some network + integration tests automatically. Closes ticket 29280. [View Less]

1 0

[tor/maint-0.4.0] Travis: remove a redundant os: linux line
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 75f9ae9029b4244658042ce7a4243202bfb4c527 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:11:25 2019 +1000 Travis: remove a redundant os: linux line Linux is the first item in the os matrix, so we don't need to specify it under matrix: include: . Part of 29280. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 562036e51..190f43bd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ matrix:… [View More]

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 518b69b57cbb33bc382892377d4b1208e14d8a8d Merge: fb977f8ca 121854629 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 10:54:12 2019 +1000 Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9 .travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 84f2c0affbace6227882a9fd440da74515aa7c12 Merge: b0fa1f4fb 75f9ae902 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:31:17 2019 +1000 Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035 .travis.yml | 19 +++++++++++++++---- changes/chutney_ci | 3 +++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --cc .travis.yml index 861b37f08,190f43bd0..8493589f7 --- a/.travis.yml +++ b/.travis.yml @@@ -45,19 -36,13 +45,22 @@@ matrix - env: … [View More]COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We only want to check these build option combinations once ## (they shouldn't vary by compiler or OS) - ## We run coverage with hardening off, which seems like enough + ## We run rust and coverage with hardening off, which seems like enough # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + # We also try running a hardened clang build with chutney on Linux. + - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + compiler: clang + # We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" + ## Check rust online with distcheck, to make sure we remove rust products + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + ## Check disable module dirauth with and without rust + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## Check NSS + - env: NSS_OPTIONS="--enable-nss" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@@ -166,39 -145,25 +169,46 @@@ install - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ## If we're on OSX, and using asciidoc, configure asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi + ## If we're using Rust, download rustup + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + ## Install the nightly channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi + ## If we're running chutney, install it. + - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; fi + ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + ## Get some info about rustup, rustc and cargo + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustup; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + ## Get python version + - python --version + ## If we're running chutney, show the chutney commit + - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log notice --target RUN_ALL; fi - - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi @@@ -207,11 -172,10 +217,12 @@@ after_failure ## But the log is too long for travis' rendered view, so tail it. - tail -1000 config.log || echo "tail failed" ## `make check` will leave a log file with more details of test failures. - - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi + - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi before_cache: ## Delete all gcov files. [View Less]

1 0

[tor/maint-0.4.0] Travis: SKIP_MAKE_CHECK="yes" when running stem
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 6bc8dedbed31abc40ca3017ac4f26a3373eac40d Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:33:54 2019 +1000 Travis: SKIP_MAKE_CHECK="yes" when running stem And add some comments about stem Part of 29280. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8493589f7..66d39f69c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ matrix: - env: CHUTNEY="yes" … [View More]

1 0

[tor/maint-0.4.0] Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 7b05f19801e333702a6100ce6c3bff4b9e756b21 Merge: afa2c39ba 6bc8dedbe Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:36:15 2019 +1000 Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040 This merge removes an incorrect comment about the stem version and commit script. .travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit e15b9b1790b5421ff8e1a375fcb4ddb07015c04a Merge: 1dd952789 6bc8dedbe Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:07:11 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5 .travis.yml | 25 +++++++++++++++++++------ changes/chutney_ci | 3 +++ 2 files changed, 22 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit e27a74b1b12f08f0f9556e906675a4d2ebc07c50 Merge: 97e7be271 1bc2ae7be Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:11:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 1bc2ae7be7c0f418de565b4a11bbb5d510c958a9 Merge: e15b9b179 8d22c09ab Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:10:15 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 8d22c09abf47da229229fe6b5fe355a2da530bef Merge: 518b69b57 75f9ae902 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 10:55:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9 .travis.yml | 18 ++++++++++++++---- changes/chutney_ci | 3 +++ 2 files changed, 17 insertions(+), 4 deletions(-)

1 0