This repository was archived by the owner on May 28, 2021. It is now read-only.
Export logs as wercker artifacts and delete e2e namespace on test failure #188
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
harveylowndes
changed the title
harveylowndes
force-pushed
the
delete-e2e-namespace-on-failure
branch
2 times, most recently
from
67a194f to
8672523
Compare
simonlord
previously requested changes
Jul 20, 2018
test/e2e/framework/framework.go
Outdated
| @@ -248,6 +250,8 @@ func (f *Framework) BeforeEach() { | |||
| func (f *Framework) AfterEach() { | |||
| RemoveCleanupAction(f.cleanupHandle) | |||
|
|
|||
| printMySQLPodContainerLogs(f) | |||
There was a problem hiding this comment.
Needs a more accurate name. It's not printing, mysql pod container logs, it's retrieving, storing, dumping all container logs really...
test/e2e/framework/framework.go
Outdated
| func printMySQLPodContainerLogs(f *Framework) { | ||
| pods, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).List(metav1.ListOptions{}) | ||
| if err != nil { | ||
| Logf("Error retrieving pod list in namespace %s: %+v", f.Namespace.Name, err) |
There was a problem hiding this comment.
Shouldn't we bomb out here, return an error or something instead of logging and continuing
| } | ||
|
|
||
| // Operator Logs | ||
| if opPod.Name != "" { |
There was a problem hiding this comment.
Probably need else block to handle opPod.Name being empty?
There was a problem hiding this comment.
@simonlord Good point. I have just logged a message here as there is no need for a fail.
test/e2e/framework/framework.go
Outdated
|
|
||
| func printLogs(read io.ReadCloser, fileName string) error { | ||
| defer read.Close() | ||
| env := os.Getenv("WERCKER_REPORT_ARTIFACTS_DIR") |
test/e2e/framework/framework.go
Outdated
| env := os.Getenv("WERCKER_REPORT_ARTIFACTS_DIR") | ||
| dst := os.Stdout | ||
| if env != "" { | ||
| filepath := env + "/" + fileName + ".log" |
There was a problem hiding this comment.
Would be nice to use os.Separator here instead of "/", maybe use a fmt.Sprintf too
test/e2e/framework/framework.go
Outdated
| podLogs := f.ClientSet.CoreV1().Pods(f.Namespace.Name).GetLogs(podName, options) | ||
| if podLogs != nil { | ||
| Logf("Writing %s container logs to file for %s", options.Container, podName) | ||
| read, _ := podLogs.Stream() |
There was a problem hiding this comment.
what is _ in this case? If it's an error we can't ignore it...
prydie
suggested changes
Jul 20, 2018
test/e2e/framework/framework.go
Outdated
| @@ -272,3 +276,64 @@ func (f *Framework) AfterEach() { | |||
| } | |||
| f.OperatorInstalled = false | |||
| } | |||
|
|
|||
| func printMySQLPodContainerLogs(f *Framework) { | |||
test/e2e/framework/framework.go
Outdated
| func printMySQLPodContainerLogs(f *Framework) { | ||
| pods, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).List(metav1.ListOptions{}) | ||
| if err != nil { | ||
| Logf("Error retrieving pod list in namespace %s: %+v", f.Namespace.Name, err) |
There was a problem hiding this comment.
return errors.Wrap(err, "listing test Pods")(otherwise pods.Items will panic below if the above fails)
test/e2e/framework/framework.go
Outdated
| filepath := env + "/" + fileName + ".log" | ||
| file, err := os.OpenFile(filepath, os.O_WRONLY|os.O_CREATE, 0666) | ||
| if err != nil { | ||
| return fmt.Errorf("Error getting file for logs: %+v", err) |
There was a problem hiding this comment.
return errors.Wrapf(err, "opening log file %q", filepath)
test/e2e/framework/framework.go
Outdated
| } | ||
| } | ||
|
|
||
| func printLogs(read io.ReadCloser, fileName string) error { |
There was a problem hiding this comment.
Pass in full file path and load os.Getenv("WERCKER_REPORT_ARTIFACTS_DIR") on Framework initialisation
test/e2e/framework/framework.go
Outdated
| env := os.Getenv("WERCKER_REPORT_ARTIFACTS_DIR") | ||
| dst := os.Stdout | ||
| if env != "" { | ||
| filepath := env + "/" + fileName + ".log" |
There was a problem hiding this comment.
Needs moving as per above but:
filePath := path.Join(env, fmt.Sprintf("%s.log", fileName))
test/e2e/framework/framework.go
Outdated
| } | ||
| _, err := io.Copy(dst, read) | ||
| if err != nil { | ||
| return fmt.Errorf("Error exporting logs: %+v", err) |
There was a problem hiding this comment.
return errors.Wrapf(err, "writing logs to %q", filepath)
test/e2e/framework/framework.go
Outdated
| @@ -248,6 +250,8 @@ func (f *Framework) BeforeEach() { | |||
| func (f *Framework) AfterEach() { | |||
| RemoveCleanupAction(f.cleanupHandle) | |||
|
|
|||
| printMySQLPodContainerLogs(f) | |||
There was a problem hiding this comment.
if err := f.outputLogs(); err != nil {
Logf("Failed to output container logs: %v", err)
}
harveylowndes
force-pushed
the
delete-e2e-namespace-on-failure
branch
2 times, most recently
from
aa8b20a to
031fcaf
Compare
harveylowndes
force-pushed
the
delete-e2e-namespace-on-failure
branch
from
031fcaf to
631c5bc
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #177
MySQL Agent, Server and Operator logs will be exported as wercker artifacts on a per pod basis. If tests are run locally they are printed to stdout. E2E test namespace deletion follows regardless of whether the test passes or fails.