From a035c56c4f02f7d32b4413ac6f27fd5b6b658bbd Mon Sep 17 00:00:00 2001 From: Mateusz Sekara Date: Wed, 15 Jan 2025 10:44:21 +0100 Subject: [PATCH 1/3] Tests tests tests --- integration-tests/ccip-tests/actions/ccip_helpers.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/integration-tests/ccip-tests/actions/ccip_helpers.go b/integration-tests/ccip-tests/actions/ccip_helpers.go index c8edc5b2fb..4ffd22cda0 100644 --- a/integration-tests/ccip-tests/actions/ccip_helpers.go +++ b/integration-tests/ccip-tests/actions/ccip_helpers.go @@ -4055,8 +4055,7 @@ func CreateOCR2CCIPExecutionJobs( lggr.Info().Msgf("Creating CCIP-Exec job on OCR node %d job name %s", index+1, ocr2SpecExec.Name) _, err = node.Node.MustCreateJob(&ocr2SpecExec) if err != nil { - return fmt.Errorf("shouldn't fail creating CCIP-Exec job on OCR node %d job name %s - %w", index+1, - ocr2SpecExec.Name, err) + lggr.Error().Err(err).Msgf("shouldn't fail creating CCIP-Exec job on OCR node %d job name %s", index+1, ocr2SpecExec.Name) } return nil } From bd48750f7072c2a40454483f2e36bad7efaaeba5 Mon Sep 17 00:00:00 2001 From: Mateusz Sekara Date: Wed, 15 Jan 2025 11:19:40 +0100 Subject: [PATCH 2/3] Tests tests tests --- integration-tests/ccip-tests/actions/ccip_helpers.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/ccip-tests/actions/ccip_helpers.go b/integration-tests/ccip-tests/actions/ccip_helpers.go index 4ffd22cda0..8487befd0b 100644 --- a/integration-tests/ccip-tests/actions/ccip_helpers.go +++ b/integration-tests/ccip-tests/actions/ccip_helpers.go @@ -4016,7 +4016,7 @@ func CreateOCR2CCIPCommitJobs( lggr.Info().Msgf("Creating CCIP-Commit job on OCR node %d job name %s", index+1, ocr2SpecCommit.Name) _, err = node.Node.MustCreateJob(&ocr2SpecCommit) if err != nil { - return fmt.Errorf("shouldn't fail creating CCIP-Commit job on OCR node %d job name %s - %w", index+1, ocr2SpecCommit.Name, err) + lggr.Error().Err(err).Msgf("shouldn't fail creating CCIP-Commit job on OCR node %d job name %s - %w", index+1, ocr2SpecCommit.Name, err) } return nil } From 0ecc9e0eaebb5596666ce038f1efb38e40223c2d Mon Sep 17 00:00:00 2001 From: Mateusz Sekara Date: Thu, 13 Feb 2025 08:39:43 +0100 Subject: [PATCH 3/3] Bumping version --- .../tomls/ccip1.4-stress/baseline.toml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml b/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml index d78cd12595..1cd7eca962 100644 --- a/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml +++ b/integration-tests/ccip-tests/testconfig/tomls/ccip1.4-stress/baseline.toml @@ -1,21 +1,21 @@ ## Baseline performance test on simulated environment (with chaos) -## 30 chains / 300 lanes +## 50 chains / 300 lanes ## historyDepth 200 / finalityDepth 200 ## block_time = 1s ## throughput 1msg / 5s ## 20% Token, 60% DataWithToken, 15% Regular size msgs, 5% Large msgs ## -## make test_load_ccip testimage=.dkr.ecr..amazonaws.com/chainlink-ccip-tests:ccip-develop \ +## make test_load_ccip testimage=.dkr.ecr..amazonaws.com/chainlink-ccip-tests:bd48750f7072c2a40454483f2e36bad7efaaeba5 \ ## testname=TestLoadCCIPStableRequestTriggeringWithNetworkChaos \ -## override_toml=./testconfig/tomls/ccip-1.4-stress/baseline.toml +## override_toml=./testconfig/tomls/ccip1.4-stress/baseline.toml ## Adjust this value depending on what you want to test. # Using releases and git tag requires changing the image name to the correct one in `~/.testsecrets`, e.g. -# E2E_TEST_CHAINLINK_IMAGE="public.ecr.aws/w0i8p0z9/chainlink-ccip" +# E2E_TEST_CHAINLINK_IMAGE="public.ecr.aws/chainlink/ccip" # If you want to use a specific commit or a branch you need to switch to the internal ECR in `~/.testsecrets` # E2E_TEST_CHAINLINK_IMAGE=".dkr.ecr..amazonaws.com/chainlink-ccip" [CCIP.Env.NewCLCluster.Common.ChainlinkImage] -version = "2.14.0-ccip1.5.0" +version = "2.21.0-ccip1.5.19-beta.0" [CCIP] [CCIP.ContractVersions] @@ -26,7 +26,7 @@ TokenPool = '1.4.0' CommitStore = '1.2.0' [CCIP.Env] -TTL = '10h' +TTL = '12h' [CCIP.Env.Network] selected_networks = ['PRIVATE-CHAIN-1', 'PRIVATE-CHAIN-2'] @@ -72,15 +72,15 @@ block_time = 1 [CCIP.Env.NewCLCluster] NoOfNodes = 17 -NodeMemory = '10Gi' +NodeMemory = '16Gi' NodeCPU = '4' -DBMemory = '16Gi' -DBCPU = '4' +DBMemory = '32Gi' +DBCPU = '8' DBStorageClass = 'gp3' PromPgExporter = true -DBCapacity = '50Gi' +DBCapacity = '70Gi' IsStateful = true -DBArgs = ['shared_buffers=4096MB', 'effective_cache_size=8192MB', 'work_mem=128MB'] +DBArgs = ['shared_buffers=8192MB', 'effective_cache_size=16384MB', 'work_mem=128MB'] [CCIP.Env.NewCLCluster.Common] BaseConfigTOML = """ @@ -110,7 +110,7 @@ HTTPSPort = 0 [Database] MaxIdleConns = 20 -MaxOpenConns = 30 +MaxOpenConns = 40 MigrateOnStartup = true [OCR2] @@ -149,7 +149,7 @@ NoOfCommitNodes = 16 PhaseTimeout = '40m' NodeFunding = 1000.0 NoOfRoutersPerPair = 1 -NoOfNetworks = 30 +NoOfNetworks = 50 MaxNoOfLanes = 300 [CCIP.Groups.load.OffRampConfig] @@ -163,7 +163,7 @@ DynamicPriceUpdateInterval = '15s' CCIPOwnerTokens = true [CCIP.Groups.load.LoadProfile] -TestDuration = '6h' +TestDuration = '10h' TimeUnit = '5s' RequestPerUnitTime = [1] OptimizeSpace = true