moving pg and mockserver to CTF (#10372)

smartcontractkit · Aug 29, 2023 · 093f570 · 093f570
1 parent 567bc03
commit 093f570
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 548 deletions.
diff --git a/integration-tests/docker/test_env/cl_node.go b/integration-tests/docker/test_env/cl_node.go
@@ -18,16 +18,18 @@ import (
 	"github.com/pelletier/go-toml/v2"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	tc "github.com/testcontainers/testcontainers-go"
 	tcwait "github.com/testcontainers/testcontainers-go/wait"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/logwatch"
-	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
-	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2/types"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
 
+	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
+
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/integration-tests/utils"
 	"github.com/smartcontractkit/chainlink/integration-tests/utils/templates"
@@ -39,11 +41,11 @@ var (
 )
 
 type ClNode struct {
-	EnvComponent
+	test_env.EnvComponent
 	API                   *client.ChainlinkClient
 	NodeConfig            *chainlink.Config
 	NodeSecretsConfigTOML string
-	PostgresDb            *PostgresDb
+	PostgresDb            *test_env.PostgresDb
 	lw                    *logwatch.LogWatch
 }
 
@@ -76,9 +78,9 @@ func WithLogWatch(lw *logwatch.LogWatch) ClNodeOption {
 func NewClNode(networks []string, nodeConfig *chainlink.Config, opts ...ClNodeOption) *ClNode {
 	nodeDefaultCName := fmt.Sprintf("%s-%s", "cl-node", uuid.NewString()[0:8])
 	pgDefaultCName := fmt.Sprintf("pg-%s", nodeDefaultCName)
-	pgDb := NewPostgresDb(networks, WithPostgresDbContainerName(pgDefaultCName))
+	pgDb := test_env.NewPostgresDb(networks, test_env.WithPostgresDbContainerName(pgDefaultCName))
 	n := &ClNode{
-		EnvComponent: EnvComponent{
+		EnvComponent: test_env.EnvComponent{
 			ContainerName: nodeDefaultCName,
 			Networks:      networks,
 		},

diff --git a/integration-tests/docker/test_env/env_component.go b/integration-tests/docker/test_env/env_component.go
diff --git a/integration-tests/docker/test_env/geth.go b/integration-tests/docker/test_env/geth.go