RMN integration test updates (#15423)

* enable rmn tests * provide double fee to the msgs * 10x the fee * print fees * revert * revert flaky test related changes * e2e test with cursed source chain * include global curse test and enable tests in ci * refactor rmn integration test case runner * gomodtidy * lint fix * lint fix * explicitly defined subjects * fix lint
smartcontractkit · Nov 29, 2024 · 2ca1a09 · 2ca1a09
1 parent e30a43e
commit 2ca1a09
Show file tree

Hide file tree

Showing 4 changed files with 408 additions and 185 deletions.
diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -1030,21 +1030,20 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
-# Enable after flaking issue is resolved
-#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
-#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
-#    test_env_type: docker
-#    runs_on: ubuntu-latest
-#    triggers:
-#      - PR E2E Core Tests
-#      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke/ccip && 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.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
-#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && 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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1061,22 +1060,20 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
-# Enable after flaking issue is resolved
-#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
-#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
-#    test_env_type: docker
-#    runs_on: ubuntu-latest
-#    triggers:
-#      - PR E2E Core Tests
-#      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke/ccip && 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.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
-#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
-
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && 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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1093,6 +1090,35 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOneSourceChainCursed$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_TwoMessagesOneSourceChainCursed$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   # END: CCIPv1.6 tests
 

diff --git a/deployment/ccip/changeset/test_helpers.go b/deployment/ccip/changeset/test_helpers.go
@@ -33,11 +33,12 @@ import (
 
 	chainsel "github.com/smartcontractkit/chain-selectors"
 
-	"github.com/smartcontractkit/chainlink-ccip/pkg/reader"
-	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
 	jobv1 "github.com/smartcontractkit/chainlink-protos/job-distributor/v1/job"
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 
+	"github.com/smartcontractkit/chainlink-ccip/pkg/reader"
+	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
+
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	commonutils "github.com/smartcontractkit/chainlink-common/pkg/utils"
 	"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -39,6 +39,7 @@ require (
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20241125151847-c63f5f567fcd
 	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d
+	github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0
 	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.17
 	github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0
@@ -416,7 +417,6 @@ require (
 	github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect
-	github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/orchestrator v0.3.0 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.1.1-0.20241127201057-3c9282e39749 // indirect
 	github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8 // indirect