Merge conflict fixes

smartcontractkit · Sep 27, 2023 · 09f4b4c · 09f4b4c
1 parent 453048e
commit 09f4b4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -674,7 +674,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - name: (base)
+          - name: (legacy)
             tag-suffix: ""
           - name: (plugins)
             tag-suffix: -plugins

diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go
@@ -198,8 +198,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 			return nil, errors.New("cannot create nodes with custom config without nonDevNetworks")
 		}
 
-		err = b.te.StartClNodes(b.clNodeConfig, b.clNodesCount)
-		err = te.StartClNodes(b.clNodeConfig, b.clNodesCount, b.secretsConfig)
+		err = b.te.StartClNodes(b.clNodeConfig, b.clNodesCount, b.secretsConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -263,8 +262,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 			node.SetChainConfig(cfg, wsUrls, httpUrls, networkConfig, b.hasForwarders)
 		}
 
-		err := b.te.StartClNodes(cfg, b.clNodesCount)
-		err := te.StartClNodes(cfg, b.clNodesCount, b.secretsConfig)
+		err := b.te.StartClNodes(cfg, b.clNodesCount, b.secretsConfig)
 		if err != nil {
 			return nil, err
 		}