From 1f42a1308fe31931a2d1257c0aa5cc22a9468997 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Fri, 15 Nov 2024 15:59:35 -0800 Subject: [PATCH 01/10] enable rmn tests in ci --- .github/e2e-tests.yml | 17 +++++++ .../ccip-tests/testsetups/test_helpers.go | 11 +++-- integration-tests/smoke/ccip_rmn_test.go | 8 +--- integration-tests/testconfig/ccip/config.go | 48 ++++++++++++++++--- 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index aee250420e0..e770dbc9891 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -963,6 +963,23 @@ runner-test-matrix: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 + - id: smoke/ccip_rmn_test.go:* + path: integration-tests/smoke/ccip_rmn_test.go + test_env_type: docker + runs_on: ubuntu-latest + triggers: + - PR E2E Core Tests + - Merge Queue E2E Core Tests + - Nightly E2E Tests + test_cmd: cd integration-tests/ && go test smoke/ccip_rmn_test.go -timeout 12m -test.parallel=6 -count=1 -json + pyroscope_env: ci-smoke-ccipv1_6-evm-simulated + test_env_vars: + E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 + E2E_JD_VERSION: 0.4.0 + ENABLE_RMN: true + E2E_RMN_PROXY_VERSION: master-5208d09 + E2E_RMN_AFN_VERSION: master-5208d09 + # END: CCIPv1.6 tests # START: CCIP tests diff --git a/integration-tests/ccip-tests/testsetups/test_helpers.go b/integration-tests/ccip-tests/testsetups/test_helpers.go index 4de5d0988a2..c4a62c5d825 100644 --- a/integration-tests/ccip-tests/testsetups/test_helpers.go +++ b/integration-tests/ccip-tests/testsetups/test_helpers.go @@ -128,7 +128,7 @@ func NewLocalDevEnvironmentWithRMN( lggr logger.Logger, numRmnNodes int, ) (ccipdeployment.DeployedEnv, devenv.RMNCluster) { - tenv, dockerenv, _ := NewLocalDevEnvironment(t, lggr) + tenv, dockerenv, testCfg := NewLocalDevEnvironment(t, lggr) state, err := ccipdeployment.LoadOnchainState(tenv.Env) require.NoError(t, err) @@ -147,14 +147,15 @@ func NewLocalDevEnvironmentWithRMN( l := logging.GetTestLogger(t) config := GenerateTestRMNConfig(t, numRmnNodes, tenv, MustNetworksToRPCMap(dockerenv.EVMNetworks)) + require.NotNil(t, testCfg.CCIP) rmnCluster, err := devenv.NewRMNCluster( t, l, []string{dockerenv.DockerNetwork.ID}, config, - "rageproxy", - "latest", - "afn2proxy", - "latest", + testCfg.CCIP.RMNConfig.GetProxyImage(), + testCfg.CCIP.RMNConfig.GetProxyVersion(), + testCfg.CCIP.RMNConfig.GetAFNImage(), + testCfg.CCIP.RMNConfig.GetAFNVersion(), dockerenv.LogStream, ) require.NoError(t, err) diff --git a/integration-tests/smoke/ccip_rmn_test.go b/integration-tests/smoke/ccip_rmn_test.go index d058b3c0e72..6051edf6e77 100644 --- a/integration-tests/smoke/ccip_rmn_test.go +++ b/integration-tests/smoke/ccip_rmn_test.go @@ -16,6 +16,7 @@ import ( jobv1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/job" "github.com/smartcontractkit/chainlink-testing-framework/lib/utils/osutil" "github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext" + "github.com/smartcontractkit/chainlink/deployment" ccipdeployment "github.com/smartcontractkit/chainlink/deployment/ccip" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home" @@ -26,9 +27,6 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/logger" ) -// Set false to run the RMN tests -const skipRmnTest = true - func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { runRmnTestCase(t, rmnTestCase{ name: "messages on two lanes", @@ -177,9 +175,7 @@ const ( ) func runRmnTestCase(t *testing.T, tc rmnTestCase) { - if skipRmnTest { - t.Skip("Local only") - } + t.Parallel() require.NoError(t, os.Setenv("ENABLE_RMN", "true")) envWithRMN, rmnCluster := testsetups.NewLocalDevEnvironmentWithRMN(t, logger.TestLogger(t), len(tc.rmnNodes)) diff --git a/integration-tests/testconfig/ccip/config.go b/integration-tests/testconfig/ccip/config.go index 560c816d85f..90fc05b345f 100644 --- a/integration-tests/testconfig/ccip/config.go +++ b/integration-tests/testconfig/ccip/config.go @@ -15,12 +15,16 @@ import ( ) const ( - E2E_JD_IMAGE = "E2E_JD_IMAGE" - E2E_JD_VERSION = "E2E_JD_VERSION" - E2E_JD_GRPC = "E2E_JD_GRPC" - E2E_JD_WSRPC = "E2E_JD_WSRPC" - DEFAULT_DB_NAME = "JD_DB" - DEFAULT_DB_VERSION = "14.1" + E2E_JD_IMAGE = "E2E_JD_IMAGE" + E2E_JD_VERSION = "E2E_JD_VERSION" + E2E_JD_GRPC = "E2E_JD_GRPC" + E2E_JD_WSRPC = "E2E_JD_WSRPC" + DEFAULT_DB_NAME = "JD_DB" + DEFAULT_DB_VERSION = "14.1" + E2E_RMN_RAGEPROXY_IMAGE = "E2E_RMN_RAGEPROXY_IMAGE" + E2E_RMN_RAGEPROXY_VERSION = "E2E_RMN_RAGEPROXY_VERSION" + E2E_RMN_AFN2PROXY_IMAGE = "E2E_RMN_AFN2PROXY_IMAGE" + E2E_RMN_AFN2PROXY_VERSION = "E2E_RMN_AFN2PROXY_VERSION" ) var ( @@ -45,6 +49,38 @@ type RMNConfig struct { AFNVersion *string `toml:",omitempty"` } +func (r *RMNConfig) GetProxyImage() string { + image := pointer.GetString(r.ProxyImage) + if image == "" { + return ctfconfig.MustReadEnvVar_String(E2E_RMN_RAGEPROXY_IMAGE) + } + return image +} + +func (r *RMNConfig) GetProxyVersion() string { + version := pointer.GetString(r.ProxyVersion) + if version == "" { + return ctfconfig.MustReadEnvVar_String(E2E_RMN_RAGEPROXY_VERSION) + } + return version +} + +func (r *RMNConfig) GetAFNImage() string { + image := pointer.GetString(r.AFNImage) + if image == "" { + return ctfconfig.MustReadEnvVar_String(E2E_RMN_AFN2PROXY_IMAGE) + } + return image +} + +func (r *RMNConfig) GetAFNVersion() string { + version := pointer.GetString(r.AFNVersion) + if version == "" { + return ctfconfig.MustReadEnvVar_String(E2E_RMN_AFN2PROXY_VERSION) + } + return version +} + type NodeConfig struct { NoOfPluginNodes *int `toml:",omitempty"` NoOfBootstraps *int `toml:",omitempty"` From b223d99d38c4e27bb907f182fce754d4f984d93a Mon Sep 17 00:00:00 2001 From: AnieeG Date: Fri, 15 Nov 2024 16:06:55 -0800 Subject: [PATCH 02/10] update references --- .github/e2e-tests.yml | 4 ++-- .github/workflows/integration-tests.yml | 4 ++-- deployment/environment/devenv/.sample.env | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index e770dbc9891..1a9f1f0ffd5 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -977,8 +977,8 @@ runner-test-matrix: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 ENABLE_RMN: true - E2E_RMN_PROXY_VERSION: master-5208d09 - E2E_RMN_AFN_VERSION: master-5208d09 + E2E_RMN_RAGEPROXY_VERSION: master-5208d09 + E2E_RMN_AFN2PROXY_VERSION: master-5208d09 # END: CCIPv1.6 tests diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 79019e1c4fc..ef3d69567ca 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -210,7 +210,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 #ctf-run-tests@0.2.0 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@27467f0073162e0ca77d33ce26f649b3d0f4c188 #ctf-run-tests@0.2.0 with: workflow_name: Run Core E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || github.sha }} @@ -251,7 +251,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'merge_group' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@47a3b0cf4e87a031049eef2d951982c94db04cae #ctf-run-tests@1.0.0 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@27467f0073162e0ca77d33ce26f649b3d0f4c188 #ctf-run-tests@1.0.0 with: workflow_name: Run Core E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || github.sha }} diff --git a/deployment/environment/devenv/.sample.env b/deployment/environment/devenv/.sample.env index ddf0b97e9a9..8ab186e3044 100644 --- a/deployment/environment/devenv/.sample.env +++ b/deployment/environment/devenv/.sample.env @@ -7,6 +7,12 @@ E2E_JD_VERSION= E2E_TEST_CHAINLINK_IMAGE=public.ecr.aws/w0i8p0z9/chainlink-ccip E2E_TEST_CHAINLINK_VERSION=2.14.0-ccip1.5.0 +E2E_RMN_RAGEPROXY_IMAGE= +E2E_RMN_RAGEPROXY_VERSION=master-5208d09 +E2E_RMN_AFN2PROXY_IMAGE= +E2E_RMN_AFN2PROXY_VERSION=master-5208d09 + + # RPC Configuration E2E_TEST_SEPOLIA_WALLET_KEY= E2E_TEST_SEPOLIA_RPC_HTTP_URL_1= From 324ee54d6bc7a43b4a269ec267b345a7fecf6ed7 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Fri, 15 Nov 2024 19:51:07 -0800 Subject: [PATCH 03/10] test.parallel --- integration-tests/smoke/ccip_rmn_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/integration-tests/smoke/ccip_rmn_test.go b/integration-tests/smoke/ccip_rmn_test.go index 6051edf6e77..e1e45b70357 100644 --- a/integration-tests/smoke/ccip_rmn_test.go +++ b/integration-tests/smoke/ccip_rmn_test.go @@ -28,6 +28,7 @@ import ( ) func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { + t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "messages on two lanes", waitForExec: true, @@ -51,6 +52,7 @@ func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { } func TestRMN_MultipleMessagesOnOneLaneNoWaitForExec(t *testing.T) { + t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "multiple messages for rmn batching inspection and one rmn node down", waitForExec: false, // do not wait for execution reports @@ -73,6 +75,7 @@ func TestRMN_MultipleMessagesOnOneLaneNoWaitForExec(t *testing.T) { } func TestRMN_NotEnoughObservers(t *testing.T) { + t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "one message but not enough observers, should not get a commit report", passIfNoCommitAfter: time.Minute, // wait for a minute and assert that commit report was not delivered @@ -95,6 +98,7 @@ func TestRMN_NotEnoughObservers(t *testing.T) { } func TestRMN_DifferentSigners(t *testing.T) { + t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "different signers and different observers", homeChainConfig: homeChainConfig{ @@ -119,6 +123,7 @@ func TestRMN_DifferentSigners(t *testing.T) { } func TestRMN_NotEnoughSigners(t *testing.T) { + t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "different signers and different observers", passIfNoCommitAfter: time.Minute, // wait for a minute and assert that commit report was not delivered @@ -144,6 +149,7 @@ func TestRMN_NotEnoughSigners(t *testing.T) { } func TestRMN_DifferentRmnNodesForDifferentChains(t *testing.T) { + t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "different rmn nodes support different chains", waitForExec: false, @@ -175,7 +181,6 @@ const ( ) func runRmnTestCase(t *testing.T, tc rmnTestCase) { - t.Parallel() require.NoError(t, os.Setenv("ENABLE_RMN", "true")) envWithRMN, rmnCluster := testsetups.NewLocalDevEnvironmentWithRMN(t, logger.TestLogger(t), len(tc.rmnNodes)) From 75e4b653c4fa8faa64dc786aff95602b7cb5b94d Mon Sep 17 00:00:00 2001 From: AnieeG Date: Mon, 18 Nov 2024 08:11:58 -0800 Subject: [PATCH 04/10] try with one test --- .github/e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index 1a9f1f0ffd5..9921430727f 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -971,7 +971,7 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test smoke/ccip_rmn_test.go -timeout 12m -test.parallel=6 -count=1 -json + test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_TwoMessagesOnTwoLanes$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 From a90a6f2b311d0deffc5e4f4bf328bbaa903f72a9 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Mon, 18 Nov 2024 11:31:18 -0800 Subject: [PATCH 05/10] fix --- .github/e2e-tests.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index 47defbcf8e3..d6d4ef25c8c 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -999,12 +999,11 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_TwoMessagesOnTwoLanes$ -timeout 12m -test.parallel=1 -count=1 -json + test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_TwoMessagesOnTwoLanes$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 - ENABLE_RMN: true E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 @@ -1016,12 +1015,11 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$ -timeout 12m -test.parallel=1 -count=1 -json + test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 - ENABLE_RMN: true E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 @@ -1033,12 +1031,11 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json + test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 - ENABLE_RMN: true E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 @@ -1050,12 +1047,11 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_DifferentSigners$ -timeout 12m -test.parallel=1 -count=1 -json + test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_DifferentSigners$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 - ENABLE_RMN: true E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 @@ -1067,12 +1063,11 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json + test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 - ENABLE_RMN: true E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 @@ -1085,12 +1080,11 @@ runner-test-matrix: - PR E2E Core Tests - Merge Queue E2E Core Tests - Nightly E2E Tests - test_cmd: cd integration-tests/ && go test -test.run ^TestRMN_DifferentRmnNodesForDifferentChains$ -timeout 12m -test.parallel=1 -count=1 -json + test_cmd: cd integration-tests/smoke/ && go test -test.run ^TestRMN_DifferentRmnNodesForDifferentChains$ -timeout 12m -test.parallel=1 -count=1 -json pyroscope_env: ci-smoke-ccipv1_6-evm-simulated test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.4.0 - ENABLE_RMN: true E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 From 694cb7918bbeb58226a038e10f6cbf2c22e6914f Mon Sep 17 00:00:00 2001 From: AnieeG Date: Mon, 18 Nov 2024 12:06:34 -0800 Subject: [PATCH 06/10] fix tests --- integration-tests/ccip-tests/testsetups/test_helpers.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/integration-tests/ccip-tests/testsetups/test_helpers.go b/integration-tests/ccip-tests/testsetups/test_helpers.go index e82aebba8df..13bd4640ed6 100644 --- a/integration-tests/ccip-tests/testsetups/test_helpers.go +++ b/integration-tests/ccip-tests/testsetups/test_helpers.go @@ -21,6 +21,7 @@ import ( "github.com/smartcontractkit/chainlink/deployment" ccipdeployment "github.com/smartcontractkit/chainlink/deployment/ccip" + "github.com/smartcontractkit/chainlink/deployment/ccip/changeset" "github.com/smartcontractkit/chainlink/deployment/environment/devenv" clclient "github.com/smartcontractkit/chainlink/deployment/environment/nodeclient" "github.com/smartcontractkit/chainlink/integration-tests/actions" @@ -142,6 +143,12 @@ func NewLocalDevEnvironmentWithRMN( state, err := ccipdeployment.LoadOnchainState(tenv.Env) require.NoError(t, err) + output, err := changeset.DeployPrerequisites(tenv.Env, changeset.DeployPrerequisiteConfig{ + ChainSelectors: tenv.Env.AllChainSelectors(), + }) + require.NoError(t, err) + require.NoError(t, tenv.Env.ExistingAddresses.Merge(output.AddressBook)) + // Deploy CCIP contracts. newAddresses := deployment.NewMemoryAddressBook() err = ccipdeployment.DeployCCIPContracts(tenv.Env, newAddresses, ccipdeployment.DeployCCIPContractConfig{ From 66c74263f5632d3d34531cf98792223c667e4810 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Mon, 18 Nov 2024 15:48:49 -0800 Subject: [PATCH 07/10] comment --- .github/e2e-tests.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index d6d4ef25c8c..85b48e64879 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -1055,21 +1055,21 @@ runner-test-matrix: E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 - - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$ - path: integration-tests/smoke/ccip_rmn_test.go - test_env_type: docker - runs_on: ubuntu-latest - triggers: - - PR E2E Core Tests - - Merge Queue E2E Core Tests - - Nightly E2E Tests - test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json - pyroscope_env: ci-smoke-ccipv1_6-evm-simulated - test_env_vars: - E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 - E2E_JD_VERSION: 0.4.0 - E2E_RMN_RAGEPROXY_VERSION: master-5208d09 - E2E_RMN_AFN2PROXY_VERSION: master-5208d09 +# - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$ +# path: integration-tests/smoke/ccip_rmn_test.go +# test_env_type: docker +# runs_on: ubuntu-latest +# triggers: +# - PR E2E Core Tests +# - Merge Queue E2E Core Tests +# - Nightly E2E Tests +# test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughSigners$ -timeout 12m -test.parallel=1 -count=1 -json +# pyroscope_env: ci-smoke-ccipv1_6-evm-simulated +# test_env_vars: +# E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 +# E2E_JD_VERSION: 0.4.0 +# E2E_RMN_RAGEPROXY_VERSION: master-5208d09 +# E2E_RMN_AFN2PROXY_VERSION: master-5208d09 - id: smoke/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$ From c1d1dfec2fdc65828715c3c0c6ed48101b73e549 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Tue, 19 Nov 2024 07:29:07 -0800 Subject: [PATCH 08/10] remove parallel --- integration-tests/smoke/ccip_rmn_test.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/integration-tests/smoke/ccip_rmn_test.go b/integration-tests/smoke/ccip_rmn_test.go index 29c0c5ccc1b..94c8335df54 100644 --- a/integration-tests/smoke/ccip_rmn_test.go +++ b/integration-tests/smoke/ccip_rmn_test.go @@ -28,7 +28,6 @@ import ( ) func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { - t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "messages on two lanes", waitForExec: true, @@ -52,7 +51,6 @@ func TestRMN_TwoMessagesOnTwoLanes(t *testing.T) { } func TestRMN_MultipleMessagesOnOneLaneNoWaitForExec(t *testing.T) { - t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "multiple messages for rmn batching inspection and one rmn node down", waitForExec: false, // do not wait for execution reports @@ -75,7 +73,6 @@ func TestRMN_MultipleMessagesOnOneLaneNoWaitForExec(t *testing.T) { } func TestRMN_NotEnoughObservers(t *testing.T) { - t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "one message but not enough observers, should not get a commit report", passIfNoCommitAfter: time.Minute, // wait for a minute and assert that commit report was not delivered @@ -98,7 +95,6 @@ func TestRMN_NotEnoughObservers(t *testing.T) { } func TestRMN_DifferentSigners(t *testing.T) { - t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "different signers and different observers", homeChainConfig: homeChainConfig{ @@ -123,7 +119,6 @@ func TestRMN_DifferentSigners(t *testing.T) { } func TestRMN_NotEnoughSigners(t *testing.T) { - t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "different signers and different observers", passIfNoCommitAfter: time.Minute, // wait for a minute and assert that commit report was not delivered @@ -149,7 +144,6 @@ func TestRMN_NotEnoughSigners(t *testing.T) { } func TestRMN_DifferentRmnNodesForDifferentChains(t *testing.T) { - t.Parallel() runRmnTestCase(t, rmnTestCase{ name: "different rmn nodes support different chains", waitForExec: false, From 52309d8b5f6ef715e75e63576b45f9ecee78ac60 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Tue, 19 Nov 2024 07:30:47 -0800 Subject: [PATCH 09/10] rename image --- integration-tests/ccip-tests/testsetups/test_helpers.go | 4 ++-- integration-tests/testconfig/ccip/config.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/ccip-tests/testsetups/test_helpers.go b/integration-tests/ccip-tests/testsetups/test_helpers.go index 13bd4640ed6..4a480cdaa40 100644 --- a/integration-tests/ccip-tests/testsetups/test_helpers.go +++ b/integration-tests/ccip-tests/testsetups/test_helpers.go @@ -171,8 +171,8 @@ func NewLocalDevEnvironmentWithRMN( config, testCfg.CCIP.RMNConfig.GetProxyImage(), testCfg.CCIP.RMNConfig.GetProxyVersion(), - testCfg.CCIP.RMNConfig.GetAFNImage(), - testCfg.CCIP.RMNConfig.GetAFNVersion(), + testCfg.CCIP.RMNConfig.GetAFN2ProxyImage(), + testCfg.CCIP.RMNConfig.GetAFN2ProxyVersion(), dockerenv.LogStream, ) require.NoError(t, err) diff --git a/integration-tests/testconfig/ccip/config.go b/integration-tests/testconfig/ccip/config.go index 90fc05b345f..3ef746e29e3 100644 --- a/integration-tests/testconfig/ccip/config.go +++ b/integration-tests/testconfig/ccip/config.go @@ -65,7 +65,7 @@ func (r *RMNConfig) GetProxyVersion() string { return version } -func (r *RMNConfig) GetAFNImage() string { +func (r *RMNConfig) GetAFN2ProxyImage() string { image := pointer.GetString(r.AFNImage) if image == "" { return ctfconfig.MustReadEnvVar_String(E2E_RMN_AFN2PROXY_IMAGE) @@ -73,7 +73,7 @@ func (r *RMNConfig) GetAFNImage() string { return image } -func (r *RMNConfig) GetAFNVersion() string { +func (r *RMNConfig) GetAFN2ProxyVersion() string { version := pointer.GetString(r.AFNVersion) if version == "" { return ctfconfig.MustReadEnvVar_String(E2E_RMN_AFN2PROXY_VERSION) From 18989035c4b9e5b18c6b42a9dc1bdb34f5f20b03 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Tue, 19 Nov 2024 08:17:59 -0800 Subject: [PATCH 10/10] disable flakey test --- .github/e2e-tests.yml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index 0073f61b4f8..a3947c61f75 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -1023,21 +1023,22 @@ runner-test-matrix: E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 - - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$ - path: integration-tests/smoke/ccip_rmn_test.go - test_env_type: docker - runs_on: ubuntu-latest - triggers: - - PR E2E Core Tests - - Merge Queue E2E Core Tests - - Nightly E2E Tests - test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json - pyroscope_env: ci-smoke-ccipv1_6-evm-simulated - test_env_vars: - E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 - E2E_JD_VERSION: 0.4.0 - E2E_RMN_RAGEPROXY_VERSION: master-5208d09 - E2E_RMN_AFN2PROXY_VERSION: master-5208d09 +# Enable after flaking issue is resolved +# - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$ +# path: integration-tests/smoke/ccip_rmn_test.go +# test_env_type: docker +# runs_on: ubuntu-latest +# triggers: +# - PR E2E Core Tests +# - Merge Queue E2E Core Tests +# - Nightly E2E Tests +# test_cmd: cd integration-tests/smoke && go test -test.run ^TestRMN_NotEnoughObservers$ -timeout 12m -test.parallel=1 -count=1 -json +# pyroscope_env: ci-smoke-ccipv1_6-evm-simulated +# test_env_vars: +# E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 +# E2E_JD_VERSION: 0.4.0 +# E2E_RMN_RAGEPROXY_VERSION: master-5208d09 +# E2E_RMN_AFN2PROXY_VERSION: master-5208d09 - id: smoke/ccip_rmn_test.go:^TestRMN_DifferentSigners$ path: integration-tests/smoke/ccip_rmn_test.go @@ -1055,6 +1056,7 @@ runner-test-matrix: E2E_RMN_RAGEPROXY_VERSION: master-5208d09 E2E_RMN_AFN2PROXY_VERSION: master-5208d09 +# Enable after flaking issue is resolved # - id: smoke/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$ # path: integration-tests/smoke/ccip_rmn_test.go # test_env_type: docker