Merge ~morphis/snappy-hwe-snaps/+git/build-scripts:f/disable-debug-option into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Simon Fels]

scripts: don't use -debug option for spread to keep output less verbose

We don't need the -debug option for spread as when a test fails
enough information should be printed automatically.

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:ea4072b22c53104fe63236d2e725179e3277f30b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1518/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1578
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1425/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1969

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1518/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Are we sure we should do this? The long traces are really annoying, I agree and hate that, but it would be an issue if there is a failing test in CI. We would want more traces, and the only way wold be to modify this script in a different repo.

Maybe this could be an option that can be set from the caller to run-tests.sh?

review: Needs Information

[Simon Fels (morphis)]

Actually we should get everything we need with just -v. In addition we started to ship debug-each: statements in every spread.yaml which prints out necessary debug information like from journalctl etc which should be enough to debug a failing test case. See https://s3.amazonaws.com/archive.travis-ci.org/jobs/231532079/log.txt?X-Amz-Expires=30&X-Amz-Date=20170512T125342Z&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAJRYRXRSVGNKPKO5A/20170512/us-east-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature=629bd50f0823db65797efeb3fd1afc149f3caf936b8a6f7fe2d347bf61460c2c for en example failing test run

[Jim Hodapp (jhodapp)]

What we lack though is a way to drop into a debug shell when a test fails. I was just using this yesterday to debug the failing alsa-utils tests. We need an option to allow doing this on demand from our run-tests.sh script. If we have that, then I'm a +1.

review: Needs Information

[Simon Fels (morphis)]

Please note that this only changes the jenkins build where you can't get a debug shell anyway. You can always still use ./run-tests --debug on your host to get a debug shell when needed.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Jim Hodapp (jhodapp)]

Good to know Simon, then I'll approve this, thanks!

review: Approve

diff --git a/scripts/test-snap.sh b/scripts/test-snap.sh
index 6c0f04f..4851645 100755
--- a/scripts/test-snap.sh
+++ b/scripts/test-snap.sh
@@ -65,12 +65,12 @@ if [ -e "run-tests.sh" ] ; then
         EXTRA_ARGS="--channel=$CORE_CHANNEL"
     fi
 
-    ./run-tests.sh --debug --force-new-image \$EXTRA_ARGS
+    ./run-tests.sh --force-new-image \$EXTRA_ARGS
 else
     if [ ! -z "$CHANNEL" ] ; then
-        SNAP_CHANNEL=$CHANNEL spread -debug
+        SNAP_CHANNEL=$CHANNEL spread -v
     else
-        spread -debug
+        spread -v
     fi
 fi
 EOF