Skip to content

Commit

Permalink
[TT-1695] bump CTF to a version that uses newer Slack file upload API (…
Browse files Browse the repository at this point in the history 
…#14890)

* bump CTF to a version that uses newer Slack file upload API

* remove replace

* update load go.mod

* try fixing load tests compilation

* downgrade chainlink-automation dependency to v0.8.0 because v1.0.x has been retracted
  • Loading branch information
@Tofel
Tofel authored Oct 24, 2024
1 parent a9f86b5 commit a7e245a
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 34 deletions.
5 changes: 2 additions & 3 deletions integration-tests/ccip-tests/testreporters/ccip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,12 @@ func (r *CCIPTestReporter) SendSlackNotification(t *testing.T, slackClient *slac
// if grafanaURLProvider is set, we don't want to write the report in a file
// the report will be shared in terms of grafana dashboard link
if r.grafanaURLProvider == nil {
return testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
return testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("CCIP Test Report %s", r.namespace),
Filetype: "json",
Filename: fmt.Sprintf("ccip_report_%s.csv", r.namespace),
File: r.reportFilePath,
InitialComment: fmt.Sprintf("CCIP Test Report %s.", r.namespace),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
})
}
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ require (
github.com/segmentio/ksuid v1.0.4
github.com/sethvargo/go-retry v0.2.4
github.com/shopspring/decimal v1.4.0
github.com/slack-go/slack v0.12.2
github.com/slack-go/slack v0.15.0
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86
github.com/smartcontractkit/chain-selectors v1.0.27
github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20241023165837-8c05ee9b97d5
github.com/smartcontractkit/chainlink-ccip v0.0.0-20241022184834-e8564a286a47
github.com/smartcontractkit/chainlink-common v0.3.1-0.20241021103500-39a6e78c0286
github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.12
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1394,8 +1394,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ=
github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
github.com/slack-go/slack v0.15.0 h1:LE2lj2y9vqqiOf+qIIy0GvEoxgF1N5yLGZffmEZykt0=
github.com/slack-go/slack v0.15.0/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86 h1:qQH6fZZe31nBAG6INHph3z5ysDTPptyu0TR9uoJ1+ok=
github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86/go.mod h1:WtWOoVQQEHxRHL2hNmuRrvDfYfQG/CioFNoa9Rr2mBE=
github.com/smartcontractkit/chain-selectors v1.0.27 h1:VE/ftX9Aae4gnw67yR1raKi+30iWKL/sWq8uyiLHM8k=
Expand All @@ -1422,8 +1422,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0 h1:mgjBQIEy+3V3G6K8e+6by3xndgsXdYYsdy+7kzQZwSk=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0/go.mod h1:pdIxrooP5CFGmC0p5NTOBiZAFtMw+5pTT4de5GY3ywA=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4 h1:xDCRiuX4Z1RaAJYd7OegLDPOROsEqPsttIlP38LVqOE=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4/go.mod h1:c5Is0W7DUUEeV369pWbAOYqEktlGeIBQXefGyIMCzvE=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.12 h1:B3+KM0cNxEtynbKnvixHnW5oUCq1Dv3b0gTKYRt3dOs=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.12/go.mod h1:Mi8q2e6gSnBhVdYehNesfh3aJMibGpS/nzgfN1yHoFY=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 h1:2OxnPfvjC+zs0ZokSsRTRnJrEGJ4NVJwZgfroS1lPHs=
Expand Down
6 changes: 3 additions & 3 deletions integration-tests/load/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ require (
github.com/pelletier/go-toml/v2 v2.2.2
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.33.0
github.com/slack-go/slack v0.12.2
github.com/slack-go/slack v0.15.0
github.com/smartcontractkit/chainlink-common v0.3.1-0.20241021103500-39a6e78c0286
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.12
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241023092446-f08223db7950
github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20241009055228-33d0c0bf38de
github.com/stretchr/testify v1.9.0
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/load/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1373,8 +1373,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ=
github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
github.com/slack-go/slack v0.15.0 h1:LE2lj2y9vqqiOf+qIIy0GvEoxgF1N5yLGZffmEZykt0=
github.com/slack-go/slack v0.15.0/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
github.com/smartcontractkit/chain-selectors v1.0.27 h1:VE/ftX9Aae4gnw67yR1raKi+30iWKL/sWq8uyiLHM8k=
github.com/smartcontractkit/chain-selectors v1.0.27/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
github.com/smartcontractkit/chainlink-automation v1.0.0-alpha.0.0.20241023165837-8c05ee9b97d5 h1:C/RIiPClYBBBlSFB0QHZtVTRSx0f98mjFXdFkA7x3JM=
Expand All @@ -1397,8 +1397,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1
github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0 h1:mgjBQIEy+3V3G6K8e+6by3xndgsXdYYsdy+7kzQZwSk=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0/go.mod h1:pdIxrooP5CFGmC0p5NTOBiZAFtMw+5pTT4de5GY3ywA=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4 h1:xDCRiuX4Z1RaAJYd7OegLDPOROsEqPsttIlP38LVqOE=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4/go.mod h1:c5Is0W7DUUEeV369pWbAOYqEktlGeIBQXefGyIMCzvE=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.12 h1:B3+KM0cNxEtynbKnvixHnW5oUCq1Dv3b0gTKYRt3dOs=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.12/go.mod h1:Mi8q2e6gSnBhVdYehNesfh3aJMibGpS/nzgfN1yHoFY=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 h1:2OxnPfvjC+zs0ZokSsRTRnJrEGJ4NVJwZgfroS1lPHs=
Expand Down
10 changes: 4 additions & 6 deletions integration-tests/testreporters/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,24 +137,22 @@ func (k *KeeperBlockTimeTestReporter) SendSlackNotification(t *testing.T, slackC
return err
}

if err := testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
if err := testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("Keeper Block Time Test Report %s", k.namespace),
Filetype: "csv",
Filename: fmt.Sprintf("keeper_block_time_%s.csv", k.namespace),
File: k.keeperReportFile,
InitialComment: fmt.Sprintf("Keeper Block Time Test Report %s", k.namespace),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
}); err != nil {
return err
}
return testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
return testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("Keeper Block Time Attempted Chainlink Txs %s", k.namespace),
Filetype: "json",
Filename: fmt.Sprintf("attempted_cl_txs_%s.json", k.namespace),
File: k.attemptedTransactionsFile,
InitialComment: fmt.Sprintf("Keeper Block Time Attempted Txs %s", k.namespace),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
})
}
Expand Down
15 changes: 6 additions & 9 deletions integration-tests/testreporters/keeper_benchmark.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,33 @@ func (k *KeeperBenchmarkTestReporter) SendSlackNotification(t *testing.T, slackC
formattedDashboardUrl := fmt.Sprintf("%s%s?from=%d&to=%d&var-namespace=%s&var-cl_node=chainlink-0-0", grafanaUrl, dashboardUrl, k.Summary.StartTime, k.Summary.EndTime, k.namespace)
log.Info().Str("Dashboard", formattedDashboardUrl).Msg("Dashboard URL")

if err := testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
if err := testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("Automation Benchmark Test Summary %s", k.namespace),
Filetype: "json",
Filename: fmt.Sprintf("automation_benchmark_summary_%s.json", k.namespace),
File: k.keeperSummaryFile,
InitialComment: fmt.Sprintf("Automation Benchmark Test Summary %s.\n<%s|Test Dashboard> ", k.namespace, formattedDashboardUrl),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
}); err != nil {
return err
}

if err := testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
if err := testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("Automation Benchmark Test Report %s", k.namespace),
Filetype: "csv",
Filename: fmt.Sprintf("automation_benchmark_report_%s.csv", k.namespace),
File: k.keeperReportFile,
InitialComment: fmt.Sprintf("Automation Benchmark Test Report %s", k.namespace),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
}); err != nil {
return err
}
return testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
return testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("Automation Benchmark Attempted Chainlink Txs %s", k.namespace),
Filetype: "json",
Filename: fmt.Sprintf("attempted_cl_txs_%s.json", k.namespace),
File: k.attemptedTransactionsFile,
InitialComment: fmt.Sprintf("Automation Benchmark Attempted Txs %s", k.namespace),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
})
}
Expand Down
5 changes: 2 additions & 3 deletions integration-tests/testreporters/ocr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,12 @@ func (o *OCRSoakTestReporter) SendSlackNotification(t *testing.T, slackClient *s
return err
}

return testreporters.UploadSlackFile(slackClient, slack.FileUploadParameters{
return testreporters.UploadSlackFile(slackClient, slack.UploadFileV2Parameters{
Title: fmt.Sprintf("OCR Soak Test Report %s", o.namespace),
Filetype: "csv",
Filename: fmt.Sprintf("ocr_soak_%s.csv", o.namespace),
File: o.csvLocation,
InitialComment: fmt.Sprintf("OCR Soak Test Report %s.", o.namespace),
Channels: []string{testreporters.SlackChannel},
Channel: testreporters.SlackChannel,
ThreadTimestamp: ts,
})
}

0 comments on commit a7e245a

Please sign in to comment.