bring sync back for compatibility, add dashboard URL and handle the error msg from output

Author: skudasov

framework/components/clnode/clnode_test.go

@@ -50,7 +50,7 @@ func TestSmokeComponentDockerNodeWithSharedDB(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		err := framework.DefaultNetwork()
+		err := framework.DefaultNetwork(nil)
 		require.NoError(t, err)
 
 		t.Run(tc.name, func(t *testing.T) {
@@ -86,7 +86,7 @@ func TestSmokeComponentDockerNodeWithDB(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		err := framework.DefaultNetwork()
+		err := framework.DefaultNetwork(nil)
 		require.NoError(t, err)
 
 		t.Run(tc.name, func(t *testing.T) {

framework/components/jd/jd_test.go

@@ -15,7 +15,7 @@ import (
 // since JD is private this env var should be set locally and in CI
 // TODO: add ComponentDocker prefix to turn this on when we'll have access to ECRs
 func TestJD(t *testing.T) {
-	err := framework.DefaultNetwork()
+	err := framework.DefaultNetwork(nil)
 	require.NoError(t, err)
 	_, err = jd.NewJD(&jd.Input{
 		Image: os.Getenv("CTF_JD_IMAGE"),

framework/components/simple_node_set/nodeset_test.go

@@ -88,7 +88,7 @@ level = 'info'
 	}
 
 	for _, tc := range testCases {
-		err := framework.DefaultNetwork()
+		err := framework.DefaultNetwork(nil)
 		require.NoError(t, err)
 
 		t.Run(tc.name, func(t *testing.T) {

framework/config.go

@@ -9,6 +9,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"sync"
 	"testing"
 	"text/template"
 	"time"
@@ -192,7 +193,7 @@ func Load[X any](t *testing.T) (*X, error) {
 			require.NoError(t, err)
 		})
 	}
-	if err = DefaultNetwork(); err != nil {
+	if err = DefaultNetwork(nil); err != nil {
 		L.Info().Err(err).Msg("docker network creation failed, either docker is not running or you are running in CRIB mode")
 	}
 	return input, nil
@@ -243,12 +244,12 @@ func BaseCacheName() (string, error) {
 	return fmt.Sprintf("%s-cache.toml", name), nil
 }
 
-func DefaultNetwork() error {
+func DefaultNetwork(_ *sync.Once) error {
 	netCmd := exec.Command("docker", "network", "create", DefaultNetworkName)
-	out, err := netCmd.Output()
+	out, err := netCmd.CombinedOutput()
 	L.Debug().Str("Out", string(out)).Msg("Creating Docker network")
 	if err != nil {
-		if strings.Contains(err.Error(), "already exists") {
+		if strings.Contains(string(out), "already exists") {
 			return nil
 		}
 		return err

framework/docker.go

@@ -371,8 +371,7 @@ func RemoveTestContainers() error {
 	// Bash command for removing Docker containers and networks with "framework=ctf" label
 	cmd := exec.Command("bash", "-c", `
 		docker ps -aq --filter "label=framework=ctf" | xargs -r docker rm -f && \
-		docker volume ls -q | xargs -r docker volume rm && \
-		docker network ls --filter "label=framework=ctf" -q | xargs -r docker network rm || true
+		docker volume ls -q | xargs -r docker volume rm || true
 	`)
 	L.Debug().Msg("Running command")
 	if L.GetLevel() == zerolog.DebugLevel {

framework/observability.go

@@ -13,6 +13,7 @@ import (
 var EmbeddedObservabilityFiles embed.FS
 
 const (
+	LocalDFSoak            = "http://localhost:3000/d/f8a04cef-653f-46d3-86df-87c532300672/df-soak?orgId=1&from=now-5m&to=now&refresh=5s"
 	LocalCLNodeErrorsURL   = "http://localhost:3000/d/a7de535b-3e0f-4066-bed7-d505b6ec9ef1/cl-node-errors?orgId=1&refresh=5s"
 	LocalWorkflowEngineURL = "http://localhost:3000/d/ce589a98-b4be-4f80-bed1-bc62f3e4414a/workflow-engine?orgId=1&refresh=5s&from=now-15m&to=now"
 	LocalLogsURL           = "http://localhost:3000/explore?panes=%7B%22qZw%22:%7B%22datasource%22:%22P8E80F9AEF21F6940%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%7Bjob%3D%5C%22ctf%5C%22%7D%22,%22queryType%22:%22range%22,%22datasource%22:%7B%22type%22:%22loki%22,%22uid%22:%22P8E80F9AEF21F6940%22%7D,%22editorMode%22:%22code%22%7D%5D,%22range%22:%7B%22from%22:%22now-15m%22,%22to%22:%22now%22%7D%7D%7D&schemaVersion=1&orgId=1"
@@ -120,6 +121,7 @@ func ObservabilityUp() error {
 	if err := NewPromtail(); err != nil {
 		return err
 	}
+	_ = DefaultNetwork(nil)
 	err := RunCommand("bash", "-c", fmt.Sprintf(`
 		cd %s && \
 		docker compose up -d
@@ -134,6 +136,7 @@ func ObservabilityUp() error {
 	L.Info().Msgf("Pyroscope: %s", LocalPyroScopeURL)
 	L.Info().Msgf("CL Node Errors: %s", LocalCLNodeErrorsURL)
 	L.Info().Msgf("Workflow Engine: %s", LocalWorkflowEngineURL)
+	L.Info().Msgf("DF Soak: %s", LocalDFSoak)
 	return nil
 }