Skip to content

Commit e5116c1

Browse files
committed
tests: update policy tests matrix to require modern buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
1 parent 30b6352 commit e5116c1

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

tests/policy_build.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var policyBuildTests = []func(t *testing.T, sb integration.Sandbox){
2424
}
2525

2626
func testBuildPolicyAllow(t *testing.T, sb integration.Sandbox) {
27+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
2728
dockerfile := []byte(`
2829
FROM busybox:latest
2930
RUN echo policy-ok
@@ -57,6 +58,7 @@ decision := {"allow": allow}
5758
}
5859

5960
func testBuildPolicyDeny(t *testing.T, sb integration.Sandbox) {
61+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
6062
dockerfile := []byte(`
6163
FROM busybox:latest
6264
RUN echo policy-nope
@@ -93,6 +95,7 @@ decision := {"allow": allow, "deny_msg": deny_msg}
9395
}
9496

9597
func testBuildPolicyImageName(t *testing.T, sb integration.Sandbox) {
98+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
9699
registry, err := sb.NewRegistry()
97100
if errors.Is(err, integration.ErrRequirements) {
98101
t.Skip(err.Error())
@@ -415,6 +418,7 @@ decision := {"allow": allow}
415418
}
416419

417420
func testBuildPolicyEnv(t *testing.T, sb integration.Sandbox) {
421+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
418422
testCases := []struct {
419423
name string
420424
policy string

tests/policy_eval.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ var policyEvalTests = []func(t *testing.T, sb integration.Sandbox){
2323
}
2424

2525
func testPolicyEvalAllow(t *testing.T, sb integration.Sandbox) {
26+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
2627
policyFile := []byte(`
2728
package docker
2829
@@ -51,6 +52,7 @@ decision := {"allow": allow}
5152
}
5253

5354
func testPolicyEvalDeny(t *testing.T, sb integration.Sandbox) {
55+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
5456
policyFile := []byte(`
5557
package docker
5658
@@ -80,6 +82,7 @@ decision := {"allow": allow}
8082
}
8183

8284
func testPolicyEvalPrint(t *testing.T, sb integration.Sandbox) {
85+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
8386
cmd := buildxCmd(sb, withArgs(
8487
"policy",
8588
"eval",
@@ -99,6 +102,7 @@ func testPolicyEvalPrint(t *testing.T, sb integration.Sandbox) {
99102
}
100103

101104
func testPolicyEvalFields(t *testing.T, sb integration.Sandbox) {
105+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
102106
registry, err := sb.NewRegistry()
103107
if errors.Is(err, integration.ErrRequirements) {
104108
t.Skip(err.Error())
@@ -171,6 +175,7 @@ func testPolicyEvalFields(t *testing.T, sb integration.Sandbox) {
171175
}
172176

173177
func testPolicyEvalLabel(t *testing.T, sb integration.Sandbox) {
178+
skipNoCompatBuildKit(t, sb, ">= 0.26.0-0", "policy input requires BuildKit v0.26.0+")
174179
registry, err := sb.NewRegistry()
175180
if errors.Is(err, integration.ErrRequirements) {
176181
t.Skip(err.Error())

0 commit comments

Comments
 (0)