opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9113 from cevich/ginkgo_logs_artifact

Browse Source 
Cirrus: Collect ginkgo node logs artifacts
This commit is contained in:
OpenShift Merge Robot
2021-02-04 15:55:18 -05:00
committed by GitHub
parent aaa86c68c0 6a6e868290
commit e6e3520498
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.cirrus.yml
View File

@ -433,7 +433,6 @@ apiv2_test_task:
path: ./*.html path: ./*.html
type: text/html type: text/html
package_versions_script: '$SCRIPT_BASE/logcollector.sh packages' package_versions_script: '$SCRIPT_BASE/logcollector.sh packages'
ginkgo_node_logs_script: '$SCRIPT_BASE/logcollector.sh ginkgo'
df_script: '$SCRIPT_BASE/logcollector.sh df' df_script: '$SCRIPT_BASE/logcollector.sh df'
audit_log_script: '$SCRIPT_BASE/logcollector.sh audit' audit_log_script: '$SCRIPT_BASE/logcollector.sh audit'
journal_script: '$SCRIPT_BASE/logcollector.sh journal' journal_script: '$SCRIPT_BASE/logcollector.sh journal'
@ -478,7 +477,11 @@ local_integration_test_task: &local_integration_test_task
gopath_cache: *ro_gopath_cache gopath_cache: *ro_gopath_cache
setup_script: *setup setup_script: *setup
main_script: *main 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 # Nearly identical to `local_integration_test` except all operations
@ -521,7 +524,7 @@ container_integration_test_task:
gopath_cache: *ro_gopath_cache gopath_cache: *ro_gopath_cache
setup_script: *setup setup_script: *setup
main_script: *main main_script: *main
always: *logs_artifacts always: *int_logs_artifacts
# Execute most integration tests as a regular (non-root) user. # Execute most integration tests as a regular (non-root) user.
@ -542,7 +545,7 @@ rootless_integration_test_task:
gopath_cache: *ro_gopath_cache gopath_cache: *ro_gopath_cache
setup_script: *setup setup_script: *setup
main_script: *main main_script: *main
always: *logs_artifacts always: *int_logs_artifacts
# Always run subsequent to integration tests. While parallelism is lost # Always run subsequent to integration tests. While parallelism is lost

1
contrib/cirrus/logcollector.sh
View File

@ -31,7 +31,6 @@ case $1 in
esac esac
;; ;;
df) showrun df -lhTx tmpfs ;; df) showrun df -lhTx tmpfs ;;
ginkgo) showrun cat $CIRRUS_WORKING_DIR/test/e2e/ginkgo-node-*.log ;;
journal) showrun journalctl -b ;; journal) showrun journalctl -b ;;
podman) showrun ./bin/podman system info ;; podman) showrun ./bin/podman system info ;;
server) server)