Merge pull request #180 from xibz/jailer_override

Adds FC_TEST_JAILER_BIN to specify test jailer bin

Author: xibz

.buildkite/pipeline.yml

@@ -104,5 +104,3 @@ steps:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
       distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
       hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
-
-

machine_test.go

@@ -46,7 +46,8 @@ const (
 	firecrackerBinaryPath        = "firecracker"
 	firecrackerBinaryOverrideEnv = "FC_TEST_BIN"
 
-	defaultJailerBinary = "jailer"
+	defaultJailerBinary     = "jailer"
+	jailerBinaryOverrideEnv = "FC_TEST_JAILER_BIN"
 
 	defaultTuntapName = "fc-test-tap0"
 	tuntapOverrideEnv = "FC_TEST_TAP"
@@ -184,6 +185,7 @@ func TestJailerMicroVMExecution(t *testing.T) {
 			},
 		},
 		JailerCfg: &JailerConfig{
+			JailerBinary:   getJailerBinaryPath(),
 			GID:            Int(jailerGID),
 			UID:            Int(jailerUID),
 			NumaNode:       Int(0),
@@ -473,6 +475,13 @@ func getFirecrackerBinaryPath() string {
 	return filepath.Join(testDataPath, firecrackerBinaryPath)
 }
 
+func getJailerBinaryPath() string {
+	if val := os.Getenv(jailerBinaryOverrideEnv); val != "" {
+		return val
+	}
+	return filepath.Join(testDataPath, defaultJailerBinary)
+}
+
 func getVmlinuxPath(t *testing.T) string {
 	t.Helper()
 	vmlinuxPath := filepath.Join(testDataPath, "./vmlinux")