refactor helper to use in cli in CLD #15647

krehermann · 2024-12-11T20:12:39Z

DPA-1396

refactor to support timelock runner as cli

Requires

Supports

https://github.com/smartcontractkit/chainlink-deployments/pull/333

github-actions · 2024-12-11T20:26:18Z

Flakeguard Summary

Ran new or updated tests between develop and c392124 (dev-auto/mcms-exec-lib).

View Flaky Detector Details | Compare Changes

Found Flaky Tests ❌

Name	Pass Ratio	Panicked?	Timed Out?	Race?	Runs	Successes	Failures	Skips	Package	Package Panicked?	Avg Duration	Code Owners
Test_NewAcceptOwnershipChangeset	0.00%	true	false	false	3	0	3	0	github.com/smartcontractkit/chainlink/deployment/ccip/changeset	true	0s	@smartcontractkit/ccip, @smartcontractkit/core

Artifacts

For detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json.

github-actions · 2024-12-11T20:27:19Z

AER Report: CI Core ran successfully ✅

aer_workflow , commit

AER Report: Operator UI CI ran successfully ✅

aer_workflow , commit

deployment/common/changeset/mcms_helpers.go

cgruber · 2024-12-12T01:12:17Z

deployment/common/changeset/test_helpers.go

@@ -91,6 +91,7 @@ func ApplyChangesets(t *testing.T, e deployment.Environment, timelockContractsPe
 			NodeIDs:           e.NodeIDs,
 			Offchain:          e.Offchain,
 			OCRSecrets:        e.OCRSecrets,
+			GetContext:        e.GetContext,


Dammit, another one. Shouldn't we be using NewEnvironment here instead of priming the struct anyway? Sigh.

(Not a review, just drive-by frustration)

krehermann · 2024-12-12T01:38:02Z

deployment/common/changeset/state.go

 }

-// Validate checks that all fields are non-nil, ensuring it's ready
-// for use generating views or interactions.
-func (state MCMSWithTimelockState) Validate() error {


mv with contracts to proposalutils

krehermann · 2024-12-12T01:39:07Z

deployment/common/proposalutils/mcms_helpers.go

+// for a MCMSWithTimelock contract deployment.
+// It is public for use in product specific packages.
+// Either all fields are nil or all fields are non-nil.
+type MCMSWithTimelockContracts struct {


to use MaybeLoad.. and avoid import cycle need to defn this in this package. mv of MCMSWithTimelockState

krehermann · 2024-12-12T01:39:45Z

deployment/ccip/changeset/accept_ownership_test.go

 )

 func Test_NewAcceptOwnershipChangeset(t *testing.T) {
+	t.Parallel()


ci is timing out. parallelize many ccip tests

cgruber · 2024-12-12T01:56:23Z

deployment/common/changeset/mcms_helpers.go

+// If the block start is not provided, it assumes that the operations have not been scheduled yet
+// and executes all the operations for the given chain.
+// It is an error if there are no operations for the given chain.
+func RunTimelockExecutor(env deployment.Environment, cfg RunTimelockExecutorConfig) error {


Sigh. It makes me nervous having this all accessible to changesets, as I want to avoid changesets themselves from ever executing this logic. But I guess this is fine for now - I agree, it probably ought to go into MCMS library though. We can move it there later.

do either of these make it better:

in a real env (with non zero timelock) it doesn't matter b/c the duration must pass while in the timelock

moving pkgs out of changeset

I think both help, yeah.

github-actions · 2024-12-12T02:23:28Z

Flakeguard Summary

Ran new or updated tests between develop and 549b3a7 (dev-auto/mcms-exec-lib).

View Flaky Detector Details | Compare Changes

Found Flaky Tests ❌

Name	Pass Ratio	Panicked?	Timed Out?	Race?	Runs	Successes	Failures	Skips	Package	Package Panicked?	Avg Duration	Code Owners
TestInitialAddChainAppliedTwice	66.67%	false	false	false	3	2	1	0	github.com/smartcontractkit/chainlink/deployment/ccip/changeset	false	2m14.353333333s	@smartcontractkit/ccip, @smartcontractkit/core

Artifacts

For detailed logs of the failed tests, please refer to the artifact failed-test-results-with-logs.json.

krehermann · 2024-12-12T03:52:31Z

deployment/ccip/changeset/test_assertions.go

@@ -221,8 +221,8 @@ func ConfirmCommitForAllWithExpectedSeqNums(
 			return false
 		}
 	},
-		3*time.Minute,
-		1*time.Second,
+		tests.WaitTimeout(t),


this fixed a lot of flakes

it may also be related to the recent ccip smoke test nightmares

graham-chainlink · 2024-12-12T05:26:03Z

deployment/common/changeset/internal/mcms_test.go

 		ab, types.MCMSWithTimelockConfig{
-			Canceller:        changeset.SingleGroupMCMS(t),
-			Bypasser:         changeset.SingleGroupMCMS(t),
-			Proposer:         changeset.SingleGroupMCMS(t),
+			Canceller:        proposalutils.SingleGroupMCMS(t),
+			Bypasser:         proposalutils.SingleGroupMCMS(t),
+			Proposer:         proposalutils.SingleGroupMCMS(t),
 			TimelockMinDelay: big.NewInt(0),


Why not just proposalutils.SingleGroupTimelockConfig(t) ?

oversight. thanks

refactor helper to use in cli in CLD

95bf07c

krehermann force-pushed the dev-auto/mcms-exec-lib branch from c392124 to 95bf07c Compare December 11, 2024 21:10

krehermann commented Dec 11, 2024

View reviewed changes

deployment/common/changeset/mcms_helpers.go Outdated Show resolved Hide resolved

krehermann added 2 commits December 11, 2024 16:14

cleanup cfg and validation

09997ec

fix tests

25912d9

krehermann marked this pull request as ready for review December 11, 2024 23:48

krehermann requested review from a team as code owners December 11, 2024 23:48

krehermann requested a review from connorwstein December 11, 2024 23:52

krehermann assigned akhilchainani Dec 11, 2024

connorwstein reviewed Dec 12, 2024

View reviewed changes

deployment/common/changeset/mcms_helpers.go Outdated Show resolved Hide resolved

deployment/common/changeset/mcms_helpers.go Outdated Show resolved Hide resolved

deployment/common/changeset/mcms_helpers.go Outdated Show resolved Hide resolved

parallel ccip tests

fa91ed1

cgruber reviewed Dec 12, 2024

View reviewed changes

krehermann commented Dec 12, 2024

View reviewed changes

refactor mcms utils

ae0c33e

krehermann force-pushed the dev-auto/mcms-exec-lib branch from f4b09c6 to ae0c33e Compare December 12, 2024 01:49

cgruber previously approved these changes Dec 12, 2024

View reviewed changes

Merge branch 'develop' into dev-auto/mcms-exec-lib

549b3a7

krehermann dismissed cgruber’s stale review via 549b3a7 December 12, 2024 01:59

ccip wait timeout tests

4880e5e

krehermann commented Dec 12, 2024

View reviewed changes

krehermann requested review from cgruber and connorwstein December 12, 2024 03:59

krehermann requested review from akhilchainani, graham-chainlink, ecPablo, patrickhuie19 and bolekk December 12, 2024 03:59

krehermann enabled auto-merge December 12, 2024 04:04

graham-chainlink reviewed Dec 12, 2024

View reviewed changes

jmank88 previously approved these changes Dec 12, 2024

View reviewed changes

fix oversights

8d5063e

krehermann dismissed jmank88’s stale review via 8d5063e December 12, 2024 12:47

krehermann requested review from graham-chainlink and jmank88 December 12, 2024 12:47

graham-chainlink approved these changes Dec 12, 2024

View reviewed changes

krehermann disabled auto-merge December 12, 2024 13:29

connorwstein approved these changes Dec 12, 2024

View reviewed changes

krehermann added this pull request to the merge queue Dec 12, 2024

krehermann unassigned akhilchainani Dec 12, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 12, 2024

krehermann added this pull request to the merge queue Dec 12, 2024

Merged via the queue into develop with commit dde1751 Dec 12, 2024
193 checks passed

krehermann deleted the dev-auto/mcms-exec-lib branch December 12, 2024 15:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor helper to use in cli in CLD #15647

refactor helper to use in cli in CLD #15647

krehermann commented Dec 11, 2024 •

edited by jira bot

Loading

github-actions bot commented Dec 11, 2024

github-actions bot commented Dec 11, 2024 •

edited

Loading

cgruber Dec 12, 2024

krehermann Dec 12, 2024

krehermann Dec 12, 2024

krehermann Dec 12, 2024

cgruber Dec 12, 2024

krehermann Dec 12, 2024 •

edited

Loading

cgruber Dec 12, 2024

github-actions bot commented Dec 12, 2024

krehermann Dec 12, 2024

krehermann Dec 12, 2024

graham-chainlink Dec 12, 2024

krehermann Dec 12, 2024

refactor helper to use in cli in CLD #15647

refactor helper to use in cli in CLD #15647

Conversation

krehermann commented Dec 11, 2024 • edited by jira bot Loading

Requires

Supports

github-actions bot commented Dec 11, 2024

Flakeguard Summary

Found Flaky Tests ❌

Artifacts

github-actions bot commented Dec 11, 2024 • edited Loading

AER Report: CI Core ran successfully ✅

AER Report: Operator UI CI ran successfully ✅

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

krehermann Dec 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 12, 2024

Flakeguard Summary

Found Flaky Tests ❌

Artifacts

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

krehermann commented Dec 11, 2024 •

edited by jira bot

Loading

github-actions bot commented Dec 11, 2024 •

edited

Loading

krehermann Dec 12, 2024 •

edited

Loading