Skip to content

Commit

Permalink
add logstream flushing to default ccip cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Tofel committed Dec 11, 2024
1 parent 80dd5d2 commit effcb0b
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions integration-tests/ccip-tests/testsetups/ccip.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/config"
"github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/environment"
"github.com/smartcontractkit/chainlink-testing-framework/lib/networks"
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/osutil"
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"

integrationactions "github.com/smartcontractkit/chainlink/integration-tests/actions"
Expand Down Expand Up @@ -1386,6 +1387,8 @@ func (o *CCIPTestSetUpOutputs) CreateEnvironment(
t.Cleanup(func() {
if configureCLNode {
if ccipEnv.LocalCluster != nil {
flushClLogs(*lggr, ccipEnv.LocalCluster)

err := ccipEnv.LocalCluster.Terminate()
require.NoError(t, err, "Local cluster termination shouldn't fail")
require.NoError(t, o.Reporter.SendReport(t, namespace, false), "Aggregating and sending report shouldn't fail")
Expand All @@ -1406,6 +1409,24 @@ func (o *CCIPTestSetUpOutputs) CreateEnvironment(
return chainByChainID
}

func flushClLogs(l zerolog.Logger, testEnv *test_env.CLClusterTestEnv) {
l.Info().Msg("Shutting down LogStream")
logPath, err := osutil.GetAbsoluteFolderPath("logs")
if err == nil {
l.Info().Str("Absolute path", logPath).Msg("LogStream logs folder location")
}

l.Info().Msg("Flushing LogStream logs")
// we can't do much if this fails, so we just log the error in LogStream
if err := testEnv.LogStream.FlushAndShutdown(); err != nil {
l.Error().Err(err).Msg("Error flushing and shutting down LogStream")
}
testEnv.LogStream.PrintLogTargetsLocations()
testEnv.LogStream.SaveLogLocationInTestSummary()

l.Info().Msg("Finished shutting down LogStream")
}

func createEnvironmentConfig(t *testing.T, envName string, testConfig *CCIPTestConfig, reportPath string) *environment.Config {
envConfig := &environment.Config{
NamespacePrefix: envName,
Expand Down

0 comments on commit effcb0b

Please sign in to comment.