Add BuildKite log file artifacts

Signed-off-by: xibz <[email protected]>

Author: xibz

.buildkite/hooks/pre-exit

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo rm -rf testdata/logs

.buildkite/master.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS=
+exitCode=$?
+sudo -E buildkite-agent artifact upload $BUILDKITE_BUILD_CHECKOUT_PATH/testdata/logs/
+
+exit $exitCode

.buildkite/pipeline.yml

@@ -115,7 +115,7 @@ steps:
       - 'chmod +x testdata/firecracker-master'
       - 'buildkite-agent artifact download testdata/jailer-master .'
       - 'chmod +x testdata/jailer-master'
-      - "sudo -E FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
+      - "sudo -E .buildkite/master.sh"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
       distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"

.gitignore

@@ -5,3 +5,4 @@ jailer-*
 vmlinux
 root-drive.img
 TestPID.img
+testdata/logs/

jailer.go

@@ -136,7 +136,10 @@ func (b JailerCommandBuilder) Args() []string {
 		args = append(args, "--daemonize")
 	}
 
-	args = append(args, b.firecrackerArgs...)
+	if len(b.firecrackerArgs) > 0 {
+		args = append(args, "--")
+		args = append(args, b.firecrackerArgs...)
+	}
 
 	return args
 }

jailer_test.go

@@ -162,6 +162,7 @@ func TestJail(t *testing.T) {
 				"/path/to/firecracker",
 				"--node",
 				"0",
+				"--",
 				"--seccomp-level",
 				"0",
 			},
@@ -190,6 +191,7 @@ func TestJail(t *testing.T) {
 				"/path/to/firecracker",
 				"--node",
 				"0",
+				"--",
 				"--seccomp-level",
 				"0",
 			},
@@ -224,6 +226,7 @@ func TestJail(t *testing.T) {
 				"/tmp",
 				"--netns",
 				"/path/to/netns",
+				"--",
 				"--seccomp-level",
 				"0",
 			},

machine_test.go

@@ -59,9 +59,10 @@ const (
 )
 
 var (
-	skipTuntap   bool
-	testDataPath = "./testdata"
-	testDataBin  = filepath.Join(testDataPath, "bin")
+	skipTuntap      bool
+	testDataPath    = "./testdata"
+	testDataLogPath = filepath.Join(testDataPath, "logs")
+	testDataBin     = filepath.Join(testDataPath, "bin")
 
 	testRootfs = filepath.Join(testDataPath, "root-drive.img")
 )
@@ -72,6 +73,10 @@ func init() {
 	if val := os.Getenv(testDataPathEnv); val != "" {
 		testDataPath = val
 	}
+
+	if err := os.MkdirAll(testDataLogPath, 0777); err != nil {
+		panic(err)
+	}
 }
 
 // Ensure that we can create a new machine
@@ -106,9 +111,12 @@ func TestJailerMicroVMExecution(t *testing.T) {
 	}
 	fctesting.RequiresRoot(t)
 
+	logPath := filepath.Join(testDataLogPath, "TestJailerMicroVMExecution")
+	err := os.MkdirAll(logPath, 0777)
+	require.NoError(t, err, "unable to create %s path", logPath)
+
 	jailerUID := 123
 	jailerGID := 100
-	var err error
 	if v := os.Getenv(sudoUID); v != "" {
 		if jailerUID, err = strconv.Atoi(v); err != nil {
 			t.Fatalf("Failed to parse %q", sudoUID)
@@ -156,13 +164,21 @@ func TestJailerMicroVMExecution(t *testing.T) {
 	require.NoError(t, err, "failed to open fifo writer file")
 	defer func() {
 		fw.Close()
+		exec.Command("cp", capturedLog, logPath).Run()
 		os.Remove(capturedLog)
 		os.Remove(socketPath)
 		os.Remove(logFifo)
 		os.Remove(metricsFifo)
 		os.RemoveAll(tmpDir)
 	}()
 
+	logFd, err := os.OpenFile(
+		filepath.Join(logPath, "TestJailerMicroVMExecution.log"),
+		os.O_CREATE|os.O_RDWR,
+		0666)
+	require.NoError(t, err, "failed to create log file")
+	defer logFd.Close()
+
 	cfg := Config{
 		Debug:           true,
 		SocketPath:      socketPath,
@@ -193,6 +209,8 @@ func TestJailerMicroVMExecution(t *testing.T) {
 			ChrootBaseDir:  jailerTestPath,
 			ExecFile:       getFirecrackerBinaryPath(),
 			ChrootStrategy: NewNaiveChrootStrategy(jailerFullRootPath, vmlinuxPath),
+			Stdout:         logFd,
+			Stderr:         logFd,
 		},
 		FifoLogWriter: fw,
 	}