summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-05-14 16:41:01 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-05-15 12:07:16 -0400
commitd1f82231d65fbc656284bf46677babbb02f730b5 (patch)
tree1941e16c3623cdf4ed4ab72ac8dce8a0cb7796e6
parentd83d0abfbf6f914303c1b33d954aa115accbd999 (diff)
downloadpodman-d1f82231d65fbc656284bf46677babbb02f730b5.tar.gz
podman-d1f82231d65fbc656284bf46677babbb02f730b5.tar.bz2
podman-d1f82231d65fbc656284bf46677babbb02f730b5.zip
Add debug mode to Ginkgo, collect debug logs in Cirrus
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--.cirrus.yml2
-rw-r--r--Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 514889969..4f47bd400 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -292,12 +292,14 @@ testing_task:
setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}'
unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}'
integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}'
+ ginkgo_node_logs_script: 'cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log || echo "Ginkgo node logs not found"'
audit_log_script: 'cat /var/log/audit/audit.log || cat /var/log/kern.log'
journalctl_b_script: 'journalctl -b'
on_failure:
failed_master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh'
# Job has already failed, don't fail again and miss collecting data
+ failed_ginkgo_node_logs_script: 'cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log || echo "Ginkgo node logs not found"'
failed_audit_log_script: 'cat /var/log/audit/audit.log || cat /var/log/kern.log || echo "Uh oh, cat audit.log failed"'
failed_journalctl_b_script: 'journalctl -b || echo "Uh oh, journalctl -b failed"'
diff --git a/Makefile b/Makefile
index 10ba14248..cacc651dd 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ localunit: test/goecho/goecho varlink_generate
./contrib/cirrus/lib.sh.t
ginkgo:
- ginkgo -v -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 test/e2e/.
+ ginkgo -v -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 -debug test/e2e/.
ginkgo-remote:
ginkgo -v -tags "$(BUILDTAGS) remoteclient" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.