October 2018 - tor-commits - lists.torproject.org

[tor/master] Make sure we're not running distcheck and test-stem on the same CI job
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit ccdb7a1cf97a326fa2193a410a7b6d2ecf54d012 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Oct 19 21:40:12 2018 +0300 Make sure we're not running distcheck and test-stem on the same CI job --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 842e31cc7..39ed6132c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -208,7 +208,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: ## configure will leave a log file with more details of config failures.

1 0

[tor/master] Log stem commit id
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit 739b22c23adb0a6b7391c2241d878a76b6a3b641 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Oct 19 21:19:39 2018 +0300 Log stem commit id --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b044f9826..842e31cc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -198,7 +198,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi - - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; popd; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: - ./autogen.sh

1 0

[tor/master] Try putting stem repo cloning into install part of config
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit 4fd4e27163c0819a05d10d2d07c6646f32bf9235 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Oct 19 18:30:33 2018 +0300 Try putting stem repo cloning into install part of config Also print stem version when we have it downloaded --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0cb88c1a..b044f9826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -186,6 +186,7 @@ install: - 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 [[ "$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 @@ -197,6 +198,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; popd; fi script: - ./autogen.sh @@ -205,7 +207,7 @@ script: - ./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 [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure:

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit f6faa7681730f877ede2493a0be6c59c4c9ec9e5 Merge: fda8b5de7 709cd447f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 29 15:59:11 2018 -0400 Merge branch 'maint-0.3.5' .travis.yml | 9 +++++++-- changes/ticket27913 | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Save time in CI test-stem job
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit bee9093b556fb0381ef52680e25c94c0c337ace1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 16 13:11:42 2018 +0300 Save time in CI test-stem job When running `make test-stem` on Travis, we should refrain from also running `make check`. Furthermore, let's limit compilation to src/app/tor target. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c62702f9a..e0cb88c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,8 +204,8 @@ script: - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make test-stem; fi + - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure:

1 0

[tor/master] Merge branch '27913_rebased_035' into maint-0.3.5
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit 709cd447f0b207f969d448bd4fe2d5f2795e678d Merge: 9d75f7984 ccdb7a1cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 29 15:59:06 2018 -0400 Merge branch '27913_rebased_035' into maint-0.3.5 .travis.yml | 9 +++++++-- changes/ticket27913 | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Try putting stem repo cloning into install part of config
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit 4fd4e27163c0819a05d10d2d07c6646f32bf9235 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Oct 19 18:30:33 2018 +0300 Try putting stem repo cloning into install part of config Also print stem version when we have it downloaded --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0cb88c1a..b044f9826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -186,6 +186,7 @@ install: - 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 [[ "$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 @@ -197,6 +198,7 @@ install: - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi + - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; popd; fi script: - ./autogen.sh @@ -205,7 +207,7 @@ script: - ./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 [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure:

1 0

[tor/release-0.3.5] Save time in CI test-stem job
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit bee9093b556fb0381ef52680e25c94c0c337ace1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Oct 16 13:11:42 2018 +0300 Save time in CI test-stem job When running `make test-stem` on Travis, we should refrain from also running `make check`. Furthermore, let's limit compilation to src/app/tor target. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c62702f9a..e0cb88c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,8 +204,8 @@ script: - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make test-stem; fi + - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make src/app/tor test-stem; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure:

1 0

[tor/release-0.3.5] Add changes file
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit cf434b6c80fec69cc6ea7a12692847764ea55295 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Oct 12 11:02:58 2018 +0300 Add changes file --- changes/ticket27913 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket27913 b/changes/ticket27913 new file mode 100644 index 000000000..81ce72593 --- /dev/null +++ b/changes/ticket27913 @@ -0,0 +1,3 @@ + o Testing: + - Add new CI job to Travis configuration that runs stem-based + integration tests. Closes ticket 27913.

1 0

[tor/release-0.3.5] Try running test-stem on travis
by nickm＠torproject.org 29 Oct '18

29 Oct '18

commit 4184aa0ff722c2d2a39c1f080e42fec17fc77820 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Oct 7 18:41:05 2018 +0300 Try running test-stem on travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index ec1748e67..c62702f9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,8 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + # 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 ## But without hardening (see above) - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" @@ -203,6 +205,7 @@ script: - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi + - if [[ "$TEST_STEM" != "" ]]; then git clone --depth 1 https://github.com/torproject/stem.git ; export STEM_SOURCE_DIR=`pwd`/stem; make test-stem; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure:

1 0