Move artifacts gathering around #3154
Conversation
ghost
assigned 
Codecov Report
@@ Coverage Diff @@
## master #3154 +/- ##
=======================================
Coverage 52.24% 52.24%
=======================================
Files 102 102
Lines 15392 15392
=======================================
Hits 8042 8042
Misses 6624 6624
Partials 726 726 |
|
/assign jim-minter |
|
/unassign |
|
/lgtm |
|
Rebased |
|
/label orchestrator/openshift |
|
Flaked on #2952 |
test/e2e/openshift/util/util.go
Outdated
| @@ -153,6 +139,27 @@ func FetchLogs(kind, namespace, name string) string { | |||
| return string(out) | |||
| } | |||
|
|
|||
| // FetchClusterInfo returns node and pod information about the cluster. | |||
| func FetchClusterInfo(logPath string) { | |||
| needsLog := map[string]string{ | |||
There was a problem hiding this comment.
I'm happy for this to merge, but you don't think map[string]func() error would be a better foundation here?
There was a problem hiding this comment.
I don't feel strong either way, updated to your suggestion (which needs to be map[string]func() string).
There was a problem hiding this comment.
apols, I meant map[string]func() (string, error) - in which case the changes to the other functions aren't needed and they're more reusable
test/e2e/openshift/util/util.go
Outdated
| @@ -174,7 +185,8 @@ func fetchControlPlaneLogs(distro, version, sshKeyPath, adminName, name, locatio | |||
| case common.OpenShiftVersionUnstable: | |||
| return fetchUnstableControlPlaneLogs(distro, sshKeyPath, sshAddress, name, logPath) | |||
| default: | |||
| panic(fmt.Sprintf("BUG: invalid OpenShift version %s", version)) | |||
| log.Printf("Invalid OpenShift version %q - won't gather logs from the control plane", version) | |||
| return nil | |||
There was a problem hiding this comment.
as discussed - return fmt.Errorf() here
|
/lgtm |
|
/unassign jim-minter |
|
@jackfrancis @CecileRobertMichon please merge |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jackfrancis The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
teardownDepends on #3152