diff --git a/pkg/e2e/build_test.go b/pkg/e2e/build_test.go index c56f5a4a3c6..f0ab24c297a 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 0c257c37925..46a358f6205 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 183c685d639..d51849f49b2 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"},