diff --git a/framework/components/dockercompose/.changeset/v0.1.8.md b/framework/components/dockercompose/.changeset/v0.1.8.md new file mode 100644 index 000000000..01c4ee2b5 --- /dev/null +++ b/framework/components/dockercompose/.changeset/v0.1.8.md @@ -0,0 +1 @@ +- Wait for Red Panda Admin API to be up and running in ready checks \ No newline at end of file diff --git a/framework/components/dockercompose/chip_ingress_set/chip_ingress.go b/framework/components/dockercompose/chip_ingress_set/chip_ingress.go index 3b7225cd5..e8289de13 100644 --- a/framework/components/dockercompose/chip_ingress_set/chip_ingress.go +++ b/framework/components/dockercompose/chip_ingress_set/chip_ingress.go @@ -117,6 +117,7 @@ func New(in *Input) (*Output, error) { wait.ForListeningPort(DEFAULT_RED_PANDA_KAFKA_PORT).WithPollInterval(100*time.Millisecond), wait.NewHostPortStrategy(DEFAULT_RED_PANDA_SCHEMA_REGISTRY_PORT).WithPollInterval(100*time.Millisecond), wait.NewHostPortStrategy(DEFAULT_RED_PANDA_KAFKA_PORT).WithPollInterval(100*time.Millisecond), + wait.ForHTTP("/v1/status/ready").WithPort("9644"), // admin API port ).WithDeadline(2*time.Minute), ).WaitForService(DEFAULT_RED_PANDA_CONSOLE_SERVICE_NAME, wait.ForAll( diff --git a/framework/examples/myproject/smoke_chip.toml b/framework/examples/myproject/smoke_chip.toml index e379e66b3..365f244f2 100644 --- a/framework/examples/myproject/smoke_chip.toml +++ b/framework/examples/myproject/smoke_chip.toml @@ -1,2 +1,2 @@ [chip_ingress] - compose_file='../../components/dockercompose/chip_ingress_set/docker-compose.yml' \ No newline at end of file + compose_file='file://../../components/dockercompose/chip_ingress_set/docker-compose.yml' \ No newline at end of file diff --git a/framework/examples/myproject/smoke_chip_ingress_test.go b/framework/examples/myproject/smoke_chip_ingress_test.go index 6238f9785..cd6288599 100644 --- a/framework/examples/myproject/smoke_chip_ingress_test.go +++ b/framework/examples/myproject/smoke_chip_ingress_test.go @@ -17,7 +17,7 @@ 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") @@ -46,6 +46,7 @@ func TestChipIngressSmoke(t *testing.T) { }) t.Run("local protos can be registered", func(t *testing.T) { + t.Skip("we can only one run of these nested at a time, because they register the same protos") ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) defer cancel()