integration-tests/smoke: add plugins variant to TestOCRv2Basic

integration-tests/docker/test_env/cl_node.go

@@ -3,6 +3,7 @@ package test_env
 import (
 	"context"
 	"fmt"
+	"maps"
 	"math/big"
 	"net/url"
 	"os"
@@ -60,6 +61,15 @@ func WithSecrets(secretsTOML string) ClNodeOption {
 	}
 }
 
+func WithNodeEnvVars(ev map[string]string) ClNodeOption {
+	return func(n *ClNode) {
+		if n.ContainerEnvs == nil {
+			n.ContainerEnvs = map[string]string{}
+		}
+		maps.Copy(n.ContainerEnvs, ev)
+	}
+}
+
 // Sets custom node container name if name is not empty
 func WithNodeContainerName(name string) ClNodeOption {
 	return func(c *ClNode) {

integration-tests/smoke/ocr2_test.go

@@ -16,86 +16,102 @@ import (
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
 	"github.com/smartcontractkit/chainlink/integration-tests/types/config/node"
+	"github.com/smartcontractkit/chainlink/v2/core/config/env"
 )
 
 // Tests a basic OCRv2 median feed
 func TestOCRv2Basic(t *testing.T) {
 	t.Parallel()
-	l := logging.GetTestLogger(t)
 
-	network, err := actions.EthereumNetworkConfigFromEnvOrDefault(l)
-	require.NoError(t, err, "Error building ethereum network config")
-
-	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestInstance(t).
-		WithPrivateEthereumNetwork(network).
-		WithMockAdapter().
-		WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
-			node.WithOCR2(),
-			node.WithP2Pv2(),
-			node.WithTracing(),
-		)).
-		WithCLNodes(6).
-		WithFunding(big.NewFloat(.1)).
-		WithStandardCleanup().
-		WithLogStream().
-		Build()
-	require.NoError(t, err)
-
-	env.ParallelTransactions(true)
-
-	nodeClients := env.ClCluster.NodeAPIs()
-	bootstrapNode, workerNodes := nodeClients[0], nodeClients[1:]
-
-	linkToken, err := env.ContractDeployer.DeployLinkTokenContract()
-	require.NoError(t, err, "Deploying Link Token Contract shouldn't fail")
-
-	err = actions.FundChainlinkNodesLocal(workerNodes, env.EVMClient, big.NewFloat(.05))
-	require.NoError(t, err, "Error funding Chainlink nodes")
-
-	// Gather transmitters
-	var transmitters []string
-	for _, node := range workerNodes {
-		addr, err := node.PrimaryEthAddress()
-		if err != nil {
-			require.NoError(t, fmt.Errorf("error getting node's primary ETH address: %w", err))
-		}
-		transmitters = append(transmitters, addr)
+	for _, test := range []struct {
+		name string
+		env  map[string]string
+	}{
+		{"legacy", map[string]string{string(env.MedianPluginCmd): ""}},
+		{"plugins", map[string]string{string(env.MedianPluginCmd): "chainlink-feeds"}},
+	} {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+
+			l := logging.GetTestLogger(t)
+
+			network, err := actions.EthereumNetworkConfigFromEnvOrDefault(l)
+			require.NoError(t, err, "Error building ethereum network config")
+
+			env, err := test_env.NewCLTestEnvBuilder().
+				WithTestInstance(t).
+				WithPrivateEthereumNetwork(network).
+				WithMockAdapter().
+				WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
+					node.WithOCR2(),
+					node.WithP2Pv2(),
+					node.WithTracing(),
+				)).
+				WithCLNodeOptions(test_env.WithNodeEnvVars(test.env)).
+				WithCLNodes(6).
+				WithFunding(big.NewFloat(.1)).
+				WithStandardCleanup().
+				WithLogStream().
+				Build()
+			require.NoError(t, err)
+
+			env.ParallelTransactions(true)
+
+			nodeClients := env.ClCluster.NodeAPIs()
+			bootstrapNode, workerNodes := nodeClients[0], nodeClients[1:]
+
+			linkToken, err := env.ContractDeployer.DeployLinkTokenContract()
+			require.NoError(t, err, "Deploying Link Token Contract shouldn't fail")
+
+			err = actions.FundChainlinkNodesLocal(workerNodes, env.EVMClient, big.NewFloat(.05))
+			require.NoError(t, err, "Error funding Chainlink nodes")
+
+			// Gather transmitters
+			var transmitters []string
+			for _, node := range workerNodes {
+				addr, err := node.PrimaryEthAddress()
+				if err != nil {
+					require.NoError(t, fmt.Errorf("error getting node's primary ETH address: %w", err))
+				}
+				transmitters = append(transmitters, addr)
+			}
+
+			ocrOffchainOptions := contracts.DefaultOffChainAggregatorOptions()
+			aggregatorContracts, err := actions.DeployOCRv2Contracts(1, linkToken, env.ContractDeployer, transmitters, env.EVMClient, ocrOffchainOptions)
+			require.NoError(t, err, "Error deploying OCRv2 aggregator contracts")
+
+			err = actions.CreateOCRv2JobsLocal(aggregatorContracts, bootstrapNode, workerNodes, env.MockAdapter, "ocr2", 5, env.EVMClient.GetChainID().Uint64(), false)
+			require.NoError(t, err, "Error creating OCRv2 jobs")
+
+			ocrv2Config, err := actions.BuildMedianOCR2ConfigLocal(workerNodes, ocrOffchainOptions)
+			require.NoError(t, err, "Error building OCRv2 config")
+
+			err = actions.ConfigureOCRv2AggregatorContracts(env.EVMClient, ocrv2Config, aggregatorContracts)
+			require.NoError(t, err, "Error configuring OCRv2 aggregator contracts")
+
+			err = actions.WatchNewOCR2Round(1, aggregatorContracts, env.EVMClient, time.Minute*5, l)
+			require.NoError(t, err, "Error starting new OCR2 round")
+			roundData, err := aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(1))
+			require.NoError(t, err, "Getting latest answer from OCR contract shouldn't fail")
+			require.Equal(t, int64(5), roundData.Answer.Int64(),
+				"Expected latest answer from OCR contract to be 5 but got %d",
+				roundData.Answer.Int64(),
+			)
+
+			err = env.MockAdapter.SetAdapterBasedIntValuePath("ocr2", []string{http.MethodGet, http.MethodPost}, 10)
+			require.NoError(t, err)
+			err = actions.WatchNewOCR2Round(2, aggregatorContracts, env.EVMClient, time.Minute*5, l)
+			require.NoError(t, err)
+
+			roundData, err = aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(2))
+			require.NoError(t, err, "Error getting latest OCR answer")
+			require.Equal(t, int64(10), roundData.Answer.Int64(),
+				"Expected latest answer from OCR contract to be 10 but got %d",
+				roundData.Answer.Int64(),
+			)
+		})
 	}
-
-	ocrOffchainOptions := contracts.DefaultOffChainAggregatorOptions()
-	aggregatorContracts, err := actions.DeployOCRv2Contracts(1, linkToken, env.ContractDeployer, transmitters, env.EVMClient, ocrOffchainOptions)
-	require.NoError(t, err, "Error deploying OCRv2 aggregator contracts")
-
-	err = actions.CreateOCRv2JobsLocal(aggregatorContracts, bootstrapNode, workerNodes, env.MockAdapter, "ocr2", 5, env.EVMClient.GetChainID().Uint64(), false)
-	require.NoError(t, err, "Error creating OCRv2 jobs")
-
-	ocrv2Config, err := actions.BuildMedianOCR2ConfigLocal(workerNodes, ocrOffchainOptions)
-	require.NoError(t, err, "Error building OCRv2 config")
-
-	err = actions.ConfigureOCRv2AggregatorContracts(env.EVMClient, ocrv2Config, aggregatorContracts)
-	require.NoError(t, err, "Error configuring OCRv2 aggregator contracts")
-
-	err = actions.WatchNewOCR2Round(1, aggregatorContracts, env.EVMClient, time.Minute*5, l)
-	require.NoError(t, err, "Error starting new OCR2 round")
-	roundData, err := aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(1))
-	require.NoError(t, err, "Getting latest answer from OCR contract shouldn't fail")
-	require.Equal(t, int64(5), roundData.Answer.Int64(),
-		"Expected latest answer from OCR contract to be 5 but got %d",
-		roundData.Answer.Int64(),
-	)
-
-	err = env.MockAdapter.SetAdapterBasedIntValuePath("ocr2", []string{http.MethodGet, http.MethodPost}, 10)
-	require.NoError(t, err)
-	err = actions.WatchNewOCR2Round(2, aggregatorContracts, env.EVMClient, time.Minute*5, l)
-	require.NoError(t, err)
-
-	roundData, err = aggregatorContracts[0].GetRound(testcontext.Get(t), big.NewInt(2))
-	require.NoError(t, err, "Error getting latest OCR answer")
-	require.Equal(t, int64(10), roundData.Answer.Int64(),
-		"Expected latest answer from OCR contract to be 10 but got %d",
-		roundData.Answer.Int64(),
-	)
 }
 
 // Tests that just calling requestNewRound() will properly induce more rounds