fix configuration logic in ocrv2 smoke/soak tests

smartcontractkit · Jul 4, 2024 · 81c7d9b · 81c7d9b
1 parent 416fd23
commit 81c7d9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go
@@ -197,7 +197,7 @@ func prepareORCv2SmokeTestEnv(t *testing.T, testData ocr2test, l zerolog.Logger,
 	err = actions.CreateOCRv2JobsLocal(aggregatorContracts, bootstrapNode, workerNodes, testEnv.MockAdapter, "ocr2", 5, uint64(sethClient.ChainID), false, testData.chainReaderAndCodec)
 	require.NoError(t, err, "Error creating OCRv2 jobs")
 
-	if config.OCR2.UseExistingOffChainAggregatorsContracts() && !config.OCR2.ConfigureExistingOffChainAggregatorsContracts() {
+	if !config.OCR2.UseExistingOffChainAggregatorsContracts() || (config.OCR2.UseExistingOffChainAggregatorsContracts() && config.OCR2.ConfigureExistingOffChainAggregatorsContracts()) {
 		ocrV2Config, err := actions.BuildMedianOCR2ConfigLocal(workerNodes, ocrOffChainOptions)
 		require.NoError(t, err, "Error building OCRv2 config")
 

diff --git a/integration-tests/testsetups/ocr.go b/integration-tests/testsetups/ocr.go
@@ -350,10 +350,12 @@ func (o *OCRSoakTest) Setup(ocrTestConfig tt.OcrTestConfig) {
 			ocrOffchainOptions,
 		)
 		require.NoError(o.t, err, "Error deploying OCRv2 contracts")
-		contractConfig, err := actions.BuildMedianOCR2Config(o.workerNodes, ocrOffchainOptions)
-		require.NoError(o.t, err, "Error building median config")
-		err = actions.ConfigureOCRv2AggregatorContracts(contractConfig, o.ocrV2Instances)
-		require.NoError(o.t, err, "Error configuring OCRv2 aggregator contracts")
+		if !ocrTestConfig.GetActiveOCRConfig().UseExistingOffChainAggregatorsContracts() || (ocrTestConfig.GetActiveOCRConfig().UseExistingOffChainAggregatorsContracts() && ocrTestConfig.GetActiveOCRConfig().ConfigureExistingOffChainAggregatorsContracts()) {
+			contractConfig, err := actions.BuildMedianOCR2Config(o.workerNodes, ocrOffchainOptions)
+			require.NoError(o.t, err, "Error building median config")
+			err = actions.ConfigureOCRv2AggregatorContracts(contractConfig, o.ocrV2Instances)
+			require.NoError(o.t, err, "Error configuring OCRv2 aggregator contracts")
+		}
 	}
 
 	if o.OCRVersion == "1" {