fix: exclude test script output from the result

Now if `test` script does any changes to the build root, they don't
propagate to the final result.

Signed-off-by: Andrey Smirnov <[email protected]>

Author: smira

go.mod

@@ -17,8 +17,8 @@ require (
 	github.com/siderolabs/gen v0.8.0
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/oauth2 v0.25.0
-	golang.org/x/sync v0.10.0
+	golang.org/x/oauth2 v0.26.0
+	golang.org/x/sync v0.11.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -182,11 +182,15 @@ golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
 golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

internal/pkg/convert/node.go

@@ -269,12 +269,20 @@ func (node *NodeLLB) stepScripts(root llb.State, i int, step v1alpha2.Step) llb.
 	for _, script := range []struct {
 		Desc         string
 		Instructions v1alpha2.Instructions
+		// Detached script modifications to the files are  not propagated to the next steps.
+		Detached bool
 	}{
-		{"prepare", step.Prepare},
-		{"build", step.Build},
-		{"install", step.Install},
-		{"test", step.Test},
+		{"prepare", step.Prepare, false},
+		{"build", step.Build, false},
+		{"install", step.Install, false},
+		{"test", step.Test, true},
 	} {
+		if len(script.Instructions) == 0 {
+			continue
+		}
+
+		scriptRoot := root
+
 		for _, instruction := range script.Instructions {
 			runOptions := append([]llb.RunOption(nil), node.Graph.commonRunOptions...)
 
@@ -311,7 +319,19 @@ func (node *NodeLLB) stepScripts(root llb.State, i int, step v1alpha2.Step) llb.
 				runOptions = append(runOptions, llb.IgnoreCache)
 			}
 
-			root = root.Run(runOptions...).Root()
+			scriptRoot = scriptRoot.Run(runOptions...).Root()
+		}
+
+		if script.Detached {
+			scriptRoot = scriptRoot.File(
+				llb.Mkdir("/empty", constants.DefaultDirMode),
+			)
+
+			root = root.File(
+				llb.Copy(scriptRoot, "/empty", "/", defaultCopyOptions(node.Graph.Options, false)),
+			)
+		} else {
+			root = scriptRoot
 		}
 	}
 

internal/pkg/integration/testdata/stages/final/pkg.yaml

@@ -8,6 +8,7 @@ steps:
 - test:
     - test -f /stage-a/a
     - test -f /stage-b/b
+    - test ! -f /stage-b/bb # stage-b/bb should not exist
     - test -f /stage-d/c
     - test -f /stage-d/d
 finalize:

internal/pkg/integration/testdata/stages/stage-b/pkg.yaml

@@ -7,6 +7,10 @@ steps:
   build:
     - touch /root/b
 
+  test:
+    - test -f /root/b
+    - touch /root/bb # this should not persist, as it's part of test instructions
+
 finalize:
   - from: /root
     to: /stage-b