Merge pull request #151 from kzys/buildkite-root

Correctly set DISABLE_ROOT_TESTS on the root tests

Author: kzys

.buildkite/pipeline.yml

@@ -49,7 +49,7 @@ steps:
       - 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
       - 'ln -s /usr/local/bin/firecracker-v0.19.0 testdata/firecracker'
       - 'ln -s /usr/local/bin/jailer-v0.19.0 testdata/jailer'
-      - "DISABLE_ROOT_TESTS=true FC_TEST_TAP=fc-test-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1'"
+      - "FC_TEST_TAP=fc-test-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1' DISABLE_ROOT_TESTS=true"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
 
@@ -60,7 +60,7 @@ steps:
       - 'cp /usr/local/bin/firecracker-v0.19.0 testdata/firecracker'
       - 'cp /usr/local/bin/jailer-v0.19.0 testdata/jailer'
       - 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
-      - "sudo FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1'"
+      - "sudo FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1' DISABLE_ROOT_TESTS="
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
 

machine_test.go

@@ -909,12 +909,19 @@ func TestPID(t *testing.T) {
 		DisableValidation: true,
 	}
 
-	m, err = NewMachine(context.Background(), cfg, WithLogger(fctesting.NewLogEntry(t)))
+	ctx := context.Background()
+
+	cmd := VMCommandBuilder{}.
+		WithSocketPath(cfg.SocketPath).
+		WithBin(getFirecrackerBinaryPath()).
+		Build(ctx)
+
+	m, err = NewMachine(ctx, cfg, WithProcessRunner(cmd), WithLogger(fctesting.NewLogEntry(t)))
 	if err != nil {
 		t.Errorf("expected no error during create machine, but received %v", err)
 	}
 
-	if err := m.Start(context.Background()); err != nil {
+	if err := m.Start(ctx); err != nil {
 		t.Errorf("expected no error during Start, but received %v", err)
 	}
 	defer m.StopVMM()
@@ -932,7 +939,7 @@ func TestPID(t *testing.T) {
 		t.Errorf("expected clean kill, but received %v", err)
 	}
 
-	m.Wait(context.Background())
+	m.Wait(ctx)
 
 	if _, err := m.PID(); err == nil {
 		t.Errorf("expected an error, but received none")

network_test.go

@@ -353,6 +353,11 @@ func startCNIMachine(t *testing.T,
 	err = ioutil.WriteFile(rootfsPath, rootfsBytes, 0666)
 	require.NoError(t, err, "failed to copy vm rootfs to %s", rootfsPath)
 
+	cmd := VMCommandBuilder{}.
+		WithSocketPath(firecrackerSockPath).
+		WithBin(getFirecrackerBinaryPath()).
+		Build(ctx)
+
 	m, err := NewMachine(ctx, Config{
 		SocketPath:      firecrackerSockPath,
 		KernelImagePath: getVmlinuxPath(t),
@@ -379,7 +384,7 @@ func startCNIMachine(t *testing.T,
 			},
 		}},
 		VMID: vmID,
-	})
+	}, WithProcessRunner(cmd))
 	require.NoError(t, err, "failed to create machine with CNI network interface")
 
 	err = m.Start(context.Background())