summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-04 15:55:18 -0500
committerGitHub <noreply@github.com>2021-02-04 15:55:18 -0500
commite6e3520498500f6f81b1aa0a5b538c8069255376 (patch)
tree4ce8d7861571879f93fb8d7e8b972ae2a8710c48
parentaaa86c68c045519085fe7b174b6adce5f8373ad6 (diff)
parent6a6e86829071d20a7f7fc30d7346c95a6fd3927a (diff)
downloadpodman-e6e3520498500f6f81b1aa0a5b538c8069255376.tar.gz
podman-e6e3520498500f6f81b1aa0a5b538c8069255376.tar.bz2
podman-e6e3520498500f6f81b1aa0a5b538c8069255376.zip
Merge pull request #9113 from cevich/ginkgo_logs_artifact
Cirrus: Collect ginkgo node logs artifacts
-rw-r--r--.cirrus.yml11
-rwxr-xr-xcontrib/cirrus/logcollector.sh1
2 files changed, 7 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index eda03bf23..a23595712 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -433,7 +433,6 @@ apiv2_test_task:
path: ./*.html
type: text/html
package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
- ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo'
df_script: '$SCRIPT_BASE/logcollector.sh df'
audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
journal_script: '$SCRIPT_BASE/logcollector.sh journal'
@@ -478,7 +477,11 @@ local_integration_test_task: &local_integration_test_task
gopath_cache: *ro_gopath_cache
setup_script: *setup
main_script: *main
- always: *logs_artifacts
+ always: &int_logs_artifacts
+ <<: *logs_artifacts
+ ginkgo_node_logs_artifacts:
+ path: ./test/e2e/ginkgo-node-*.log
+ type: text/plain
# Nearly identical to `local_integration_test` except all operations
@@ -521,7 +524,7 @@ container_integration_test_task:
gopath_cache: *ro_gopath_cache
setup_script: *setup
main_script: *main
- always: *logs_artifacts
+ always: *int_logs_artifacts
# Execute most integration tests as a regular (non-root) user.
@@ -542,7 +545,7 @@ rootless_integration_test_task:
gopath_cache: *ro_gopath_cache
setup_script: *setup
main_script: *main
- always: *logs_artifacts
+ always: *int_logs_artifacts
# Always run subsequent to integration tests. While parallelism is lost
diff --git a/contrib/cirrus/logcollector.sh b/contrib/cirrus/logcollector.sh
index 323015cef..38a15ded1 100755
--- a/contrib/cirrus/logcollector.sh
+++ b/contrib/cirrus/logcollector.sh
@@ -31,7 +31,6 @@ case $1 in
esac
;;
df) showrun df -lhTx tmpfs ;;
- ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;;
journal) showrun journalctl -b ;;
podman) showrun ./bin/podman system info ;;
server)