Upload integration test logs on failure

Signed-off-by: Brad Davidson <[email protected]>

Author: brandond

.github/workflows/e2e.yaml

@@ -94,12 +94,12 @@ jobs:
         run: | 
           chmod +x ./dist/artifacts/k3s
           cd tests/e2e/${{ matrix.etest }}
-          go test -timeout=45m ./${{ matrix.etest}}_test.go -test.v -ginkgo.v -ci -local
+          go test -timeout=45m ./${{ matrix.etest }}_test.go -test.v -ginkgo.v -ci -local
       - name: On Failure, Upload Journald Logs
         uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
-          name: e2e-${{ matrix.etest}}-logs
+          name: e2e-${{ matrix.etest }}-logs
           path: tests/e2e/${{ matrix.etest }}/*log.txt
           retention-days: 30
       - name: On Failure, Launch Debug Session

.github/workflows/integration.yaml

@@ -63,7 +63,15 @@ jobs:
       run: | 
         chmod +x ./dist/artifacts/k3s
         mkdir -p $GOCOVERDIR
-        sudo -E env "PATH=$PATH" go test -timeout=45m ./tests/integration/${{ matrix.itest }}/... -run Integration -ginkgo.v -test.v
+        cd tests/integration/${{ matrix.itest }}
+        sudo -E env "PATH=$PATH" go test -timeout=45m ./... -run Integration -ginkgo.v -test.v
+    - name: On Failure, Upload Logs
+      uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: integration-${{ matrix.itest }}-logs
+        path: tests/integration/${{ matrix.itest }}/*log.txt
+        retention-days: 30
     - name: On Failure, Launch Debug Session
       uses: lhotari/action-upterm@v1
       if: ${{ failure() }}

tests/integration/integration.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"os/user"
+	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
@@ -188,12 +189,18 @@ func K3sStartServer(inputArgs ...string) (*K3sServer, error) {
 	// Give the server a new group id so we can kill it and its children later
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	// Pipe output to a file for debugging later
-	f, err := os.Create("./k3log.txt")
+	wd, err := os.Getwd()
 	if err != nil {
 		return nil, err
 	}
+	logpath := filepath.Join(wd, "k3s-log.txt")
+	f, err := os.Create("k3s-log.txt")
+	if err != nil {
+		return nil, err
+	}
+	cmd.Stdout = f
 	cmd.Stderr = f
-	logrus.Info("Starting k3s server. Check k3log.txt for logs")
+	logrus.Infof("Starting k3s server with stdout and stderr written to %s", logpath)
 	err = cmd.Start()
 	return &K3sServer{cmd, f}, err
 }
@@ -202,7 +209,7 @@ func K3sStartServer(inputArgs ...string) (*K3sServer, error) {
 // Equivalent to stopping the K3s service
 func K3sStopServer(server *K3sServer) error {
 	if server.log != nil {
-		server.log.Close()
+		defer server.log.Close()
 	}
 	if err := server.cmd.Process.Signal(syscall.SIGTERM); err != nil {
 		return err
@@ -224,8 +231,7 @@ func K3sKillServer(server *K3sServer) error {
 		return nil
 	}
 	if server.log != nil {
-		server.log.Close()
-		os.Remove(server.log.Name())
+		defer server.log.Close()
 	}
 	pgid, err := syscall.Getpgid(server.cmd.Process.Pid)
 	if err != nil {
@@ -285,7 +291,12 @@ func K3sCleanup(k3sTestLock int, dataDir string) error {
 }
 
 func K3sSaveLog(server *K3sServer, dump bool) error {
-	server.log.Close()
+	if server == nil {
+		return nil
+	}
+	if server.log != nil {
+		server.log.Close()
+	}
 	if !dump {
 		return nil
 	}