also fix for CL node container name

Author: iljapavlovs

framework/components/clnode/clnode.go

@@ -5,22 +5,25 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/go-connections/nat"
-	"github.com/smartcontractkit/chainlink-testing-framework/framework"
-	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/postgres"
-	tc "github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
 	"os"
 	"path/filepath"
 	"sync"
 	"text/template"
 	"time"
+
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/go-connections/nat"
+	tc "github.com/testcontainers/testcontainers-go"
+	"github.com/testcontainers/testcontainers-go/wait"
+
+	"github.com/smartcontractkit/chainlink-testing-framework/framework"
+	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/postgres"
 )
 
 const (
-	DefaultHTTPPort = "6688"
-	DefaultP2PPort  = "6690"
+	DefaultHTTPPort      = "6688"
+	DefaultP2PPort       = "6690"
+	CLNodeContainerLabel = "clnode"
 )
 
 var (
@@ -152,7 +155,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 	if in.Node.Name != "" {
 		containerName = in.Node.Name
 	} else {
-		containerName = framework.DefaultTCName("node")
+		containerName = framework.DefaultTCName(CLNodeContainerLabel)
 	}
 	customPorts := make([]string, 0)
 	for _, p := range in.Node.CustomPorts {

framework/components/simple_node_set/node_set.go

@@ -17,7 +17,7 @@ import (
 const (
 	DefaultHTTPPortStaticRangeStart = 10000
 	DefaultP2PStaticRangeStart      = 12000
-	CLNodeDBContainerLabel          = "clnode"
+	CLNodeContainerLabel            = "clnode"
 )
 
 // Input is a node set configuration input
@@ -78,7 +78,7 @@ func printURLs(out *Output) {
 
 func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) {
 	in.DbInput.Databases = in.Nodes
-	in.DbInput.Name = CLNodeDBContainerLabel
+	in.DbInput.Name = CLNodeContainerLabel
 	dbOut, err := postgres.NewPostgreSQL(in.DbInput)
 	if err != nil {
 		return nil, err
@@ -114,7 +114,7 @@ func sharedDBSetup(in *Input, bcOut *blockchain.Output) (*Output, error) {
 			}
 		}
 		if in.NodeSpecs[overrideIdx].Node.Name == "" {
-			nodeName = fmt.Sprintf("node%d", i)
+			nodeName = fmt.Sprintf("%s%d", CLNodeContainerLabel, i)
 		}
 		eg.Go(func() error {
 			var net string

framework/components/simple_node_set/reload.go

@@ -12,8 +12,9 @@ import (
 // UpgradeNodeSet updates nodes configuration TOML files
 // this API is discouraged, however, you can use it if nodes require restart or configuration updates, temporarily!
 func UpgradeNodeSet(in *Input, bc *blockchain.Output, wait time.Duration) (*Output, error) {
-	clNodeDBContainerNameRegex := fmt.Sprintf("%s-%s.*", postgres.DBContainerLabel, CLNodeDBContainerLabel)
-	_, err := chaos.ExecPumba(fmt.Sprintf("rm --volumes=false re2:node.*|%s", clNodeDBContainerNameRegex), wait)
+	clNodeContainerNameRegex := fmt.Sprintf("%s.*", CLNodeContainerLabel)
+	clNodeDBContainerNameRegex := fmt.Sprintf("%s-%s.*", postgres.DBContainerLabel, CLNodeContainerLabel)
+	_, err := chaos.ExecPumba(fmt.Sprintf("rm --volumes=false re2:%s|%s", clNodeContainerNameRegex, clNodeDBContainerNameRegex), wait)
 	if err != nil {
 		return nil, err
 	}