From 75ea4f942bc50eb9d1a6b8df9c3f3a36262af158 Mon Sep 17 00:00:00 2001 From: AnieeG Date: Sun, 22 Oct 2023 14:21:52 -0700 Subject: [PATCH] fix node start index --- integration-tests/ccip-tests/actions/ccip_helpers.go | 8 ++++---- integration-tests/ccip-tests/load-test.env | 10 +++++----- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/integration-tests/ccip-tests/actions/ccip_helpers.go b/integration-tests/ccip-tests/actions/ccip_helpers.go index de65fef559..08c15a78de 100644 --- a/integration-tests/ccip-tests/actions/ccip_helpers.go +++ b/integration-tests/ccip-tests/actions/ccip_helpers.go @@ -1855,8 +1855,8 @@ func (lane *CCIPLane) DeployNewCCIPLane( var bootstrapExec *client.CLNodesWithKeys var execNodes []*client.CLNodesWithKeys commitNodes := clNodes[1:] - env.commitNodeStartIndex = 1 - env.execNodeStartIndex = 1 + env.commitNodeStartIndex = 2 + env.execNodeStartIndex = 2 env.numOfCommitNodes = numOfCommitNodes env.numOfExecNodes = numOfCommitNodes if !commitAndExecOnSameDON { @@ -1866,8 +1866,8 @@ func (lane *CCIPLane) DeployNewCCIPLane( bootstrapExec = clNodes[1] // for a set-up of different commit and execution nodes second node is the bootstrapper for execution nodes commitNodes = clNodes[2 : 2+numOfCommitNodes] execNodes = clNodes[2+numOfCommitNodes:] - env.commitNodeStartIndex = 2 - env.execNodeStartIndex = 7 + env.commitNodeStartIndex = 3 + env.execNodeStartIndex = 3 + numOfCommitNodes env.numOfCommitNodes = len(commitNodes) env.numOfExecNodes = len(execNodes) } else { diff --git a/integration-tests/ccip-tests/load-test.env b/integration-tests/ccip-tests/load-test.env index ef22e0ec33..f21b5170c2 100644 --- a/integration-tests/ccip-tests/load-test.env +++ b/integration-tests/ccip-tests/load-test.env @@ -13,14 +13,14 @@ export CCIP_TESTS_ON_EXISTING_DEPLOYMENT=False export SELECTED_NETWORKS="SIMULATED,SIMULATED_1,SIMULATED_2" export CCIP_NETWORK_PAIRS="" -export CCIP_NO_OF_NETWORKS=2 -export CCIP_NO_OF_ROUTERS_PER_PAIR=1 +export CCIP_NO_OF_NETWORKS=18 +export CCIP_NO_OF_ROUTERS_PER_PAIR=2 # The load will be triggered as per # for . Example for following: 1 request per 10s for 1h export CCIP_LOAD_TEST_RATEUNIT=10s export CCIP_LOAD_TEST_RATE=1 -export CCIP_TEST_DURATION=15m +export CCIP_TEST_DURATION=2h # if CCIP_KEEP_ENV_ALIVE is set to true, the env will not be destroyed after the test. export CCIP_KEEP_ENV_ALIVE=True @@ -39,8 +39,8 @@ export CCIP_TRANSFER_AMOUNT_PER_TOKEN=1 export CCIP_DEPLOY_BLOCKSCOUT=False # if chaos is run with load -export CCIP_CHAOS_DURATION=5m -export CCIP_WAIT_BETWEEN_NEXT_CHAOS=30s +export CCIP_CHAOS_DURATION=20m +export CCIP_WAIT_BETWEEN_NEXT_CHAOS=3m # remote runner resource requirements export RR_MEM=16Gi diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 1e32c61b28..17925dc291 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -21,7 +21,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chain-selectors v1.0.2 github.com/smartcontractkit/chainlink-env v0.38.3 - github.com/smartcontractkit/chainlink-testing-framework v1.17.12-0.20231018145919-1858011e934f + github.com/smartcontractkit/chainlink-testing-framework v1.17.12-0.20231021045507-b80c9afbc467 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20230828183543-6d0939746966 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20230925165524-ffa38fe11ef8 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 9a223d469a..ce68f3603b 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -2380,8 +2380,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97ac github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca/go.mod h1:RIUJXn7EVp24TL2p4FW79dYjyno23x5mjt1nKN+5WEk= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 h1:ByVauKFXphRlSNG47lNuxZ9aicu+r8AoNp933VRPpCw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918/go.mod h1:/yp/sqD8Iz5GU5fcercjrw0ivJF7HDcupYg+Gjr7EPg= -github.com/smartcontractkit/chainlink-testing-framework v1.17.12-0.20231018145919-1858011e934f h1:q7PObDfjCtomFXOwu4rp7xqXn97//qsChmOaKGM2ToQ= -github.com/smartcontractkit/chainlink-testing-framework v1.17.12-0.20231018145919-1858011e934f/go.mod h1:RWlmjwnjIGbQAnRfKwe02Ife82nNI3rZmdI0zgkfbyk= +github.com/smartcontractkit/chainlink-testing-framework v1.17.12-0.20231021045507-b80c9afbc467 h1:Yir34O6l4QPz/jl1d5mzbxNc6vSWJlb5q3DoqKW6KkE= +github.com/smartcontractkit/chainlink-testing-framework v1.17.12-0.20231021045507-b80c9afbc467/go.mod h1:RWlmjwnjIGbQAnRfKwe02Ife82nNI3rZmdI0zgkfbyk= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU=