[DX-1118] fix beholder (#1940)

Author: Tofel

framework/components/dockercompose/.changeset/v0.1.1.md

@@ -0,0 +1 @@
+- Enhance how we wait for Chip Ingress services to start

framework/components/dockercompose/chip_ingress_set/chip_ingress.go

@@ -106,7 +106,14 @@ func New(in *Input) (*Output, error) {
 	}
 
 	stack.WaitForService(DEFAULT_CHIP_INGRESS_SERVICE_NAME,
-		wait.ForLog("GRPC server is live").WithPollInterval(200*time.Millisecond).WithStartupTimeout(1*time.Minute),
+		wait.ForAll(
+			wait.ForLog("GRPC server is live").WithPollInterval(200*time.Millisecond),
+			wait.ForListeningPort(DEFAULT_CHIP_INGRESS_GRPC_PORT),
+		).WithDeadline(1*time.Minute),
+	).WaitForService(DEFAULT_RED_PANDA_SERVICE_NAME,
+		wait.ForListeningPort(DEFAULT_RED_PANDA_KAFKA_PORT).WithStartupTimeout(1*time.Minute),
+	).WaitForService(DEFAULT_RED_PANDA_CONSOLE_SERVICE_NAME,
+		wait.ForListeningPort(DEFAULT_RED_PANDA_CONSOLE_PORT).WithStartupTimeout(1*time.Minute),
 	)
 
 	chipIngressContainer, ingressErr := stack.ServiceContainer(ctx, DEFAULT_CHIP_INGRESS_SERVICE_NAME)

framework/components/dockercompose/chip_ingress_set/docker-compose.yml

@@ -2,7 +2,7 @@
 services:
 
   chip-ingress:
-    image: ${CHIP_INGRESS_IMAGE:-chip-ingress:latest}
+    image: chip-ingress:qa-latest
     container_name: chip-ingress
     depends_on:
       - redpanda-0

framework/examples/myproject/smoke_chip.toml

@@ -1,3 +1,2 @@
 [chip_ingress]
-  compose_file='../../components/chip_ingress_set/docker-compose.yml'
-  topics=['cre']
+  compose_file='../../components/dockercompose/chip_ingress_set/docker-compose.yml'

framework/examples/myproject/smoke_chip_ingress_test.go

@@ -19,7 +19,8 @@ type ChipConfig struct {
 
 // use config file: smoke_chip.toml
 func TestChipIngressSmoke(t *testing.T) {
-	t.Skip("skipping smoke test until we have a way to fetch Chip Ingress image")
+	// t.Skip("skipping smoke test until we have a way to fetch Chip Ingress image")
+	os.Setenv("CTF_CONFIGS", "smoke_chip.toml")
 	in, err := framework.Load[ChipConfig](t)
 	require.NoError(t, err, "failed to load config")