From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 19 Nov 2019 11:44:17 +0000 (+0100)
Subject: ci: print docker output on respdiff/resperf failure
X-Git-Tag: v4.3.0~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=695e451b35fbc1139502e81801acdb87a2e48eb5;p=thirdparty%2Fknot-resolver.git

ci: print docker output on respdiff/resperf failure
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8fe21e1d..1c144f503 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -311,7 +311,7 @@ pytests:
       $(sudo -u respdiff /var/opt/respdiff/contrib/job_manager/create.py
       "$(git rev-parse --short HEAD)" -l $LABEL -t $RESPDIFF_TEST --knot-branch=$KNOT_VERSION
       --respdiff-stats /var/tmp/respdiff-jobs/ref_current/*_${RESPDIFF_TEST}_stats.json)
-    - for f in $TESTDIR/*.json; do test -s "$f" || (cat $TESTDIR/*stderr*; exit 1); done
+    - for f in $TESTDIR/*.json; do test -s "$f" || (cat $TESTDIR/*stderr*; cat $TESTDIR/j*_docker.txt; exit 1); done
     - sudo -u respdiff /var/opt/respdiff/contrib/job_manager/plot_ref.sh $TESTDIR/.. /var/tmp/respdiff-jobs/ref_current $RESPDIFF_TEST
   after_script:
     - 'cp -t . respdiff_commitdir/$RESPDIFF_TEST/j* ||:'
@@ -384,7 +384,7 @@ fwd-udp6-unbound.tls6:
       $(sudo -u respdiff /var/opt/respdiff/contrib/job_manager/create.py
       "$(git rev-parse --short HEAD)" -l $LABEL --asan -t $RESPERF_TEST --knot-branch=$KNOT_VERSION)
     - export EXITCODE=$(cat $TESTDIR/j*_exitcode)
-    - if [[ "$EXITCODE" == "0" ]]; then cat $TESTDIR/j*_resperf.txt; else cat $TESTDIR/j*_kresd.docker.txt; fi
+    - if [[ "$EXITCODE" == "0" ]]; then cat $TESTDIR/j*_resperf.txt; else cat $TESTDIR/j*_docker.txt; fi
     - exit $EXITCODE
   after_script:
     - 'cp -t . resperf_commitdir/$RESPERF_TEST/j* ||:'