From a85f8a40a9231e8664d13357c3e586dc574aff94 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 26 Nov 2024 11:01:51 +0100 Subject: [PATCH] run build tests against bake Signed-off-by: Nicolas De Loof --- pkg/e2e/build_test.go | 4 ++-- pkg/e2e/fixtures/network-test/compose.subnet.yaml | 2 +- pkg/e2e/networks_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/e2e/build_test.go b/pkg/e2e/build_test.go index c56f5a4a3..f0ab24c29 100644 --- a/pkg/e2e/build_test.go +++ b/pkg/e2e/build_test.go @@ -33,8 +33,8 @@ import ( func TestLocalComposeBuild(t *testing.T) { - for _, env := range []string{"DOCKER_BUILDKIT=0", "DOCKER_BUILDKIT=1"} { - c := NewCLI(t, WithEnv(env)) + for _, env := range []string{"DOCKER_BUILDKIT=0", "DOCKER_BUILDKIT=1", "DOCKER_BUILDKIT=1,COMPOSE-BAKE=1"} { + c := NewCLI(t, WithEnv(strings.Split(env, ",")...)) t.Run(env+" build named and unnamed images", func(t *testing.T) { // ensure local test run does not reuse previously build image diff --git a/pkg/e2e/fixtures/network-test/compose.subnet.yaml b/pkg/e2e/fixtures/network-test/compose.subnet.yaml index 0c257c379..46a358f62 100644 --- a/pkg/e2e/fixtures/network-test/compose.subnet.yaml +++ b/pkg/e2e/fixtures/network-test/compose.subnet.yaml @@ -8,5 +8,5 @@ networks: test: ipam: config: - - subnet: ${SUBNET-172.28.0.0/16} + - subnet: ${SUBNET-172.99.0.0/16} diff --git a/pkg/e2e/networks_test.go b/pkg/e2e/networks_test.go index 183c685d6..d51849f49 100644 --- a/pkg/e2e/networks_test.go +++ b/pkg/e2e/networks_test.go @@ -159,7 +159,7 @@ func TestNetworkConfigChanged(t *testing.T) { }) res := c.RunDockerComposeCmd(t, "--project-name", projectName, "exec", "test", "hostname", "-i") - res.Assert(t, icmd.Expected{Out: "172.28.0."}) + res.Assert(t, icmd.Expected{Out: "172.99.0."}) res.Combined() cmd := c.NewCmdWithEnv([]string{"SUBNET=192.168.0.0/16"},