Merge pull request #386 from kzys/loopback-thinpool

Make integration tests work with loopback devices

Author: kzys

.buildkite/al2_pipeline.yml

@@ -21,6 +21,7 @@ steps:
     env:
       DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
       EXTRAGOARGS: "-race"
+      FICD_DM_VOLUME_GROUP: "fcci-vg"
     command:
       - ./.buildkite/setup_al2.sh
       - docker run --rm -v $PWD:/mnt debian:stretch-slim rm -rf /mnt/tools/image-builder/rootfs

.buildkite/al2_test.sh

@@ -6,7 +6,8 @@ source ./.buildkite/al2env.sh
 export PATH=$bin_path:$PATH
 export FIRECRACKER_CONTAINERD_RUNTIME_CONFIG_PATH=$runtime_config_path
 export ENABLE_ISOLATED_TESTS=true
-export CONTAINERD_SOCKET=$dir/containerd.sock 
+export CONTAINERD_SOCKET=$dir/containerd.sock
+
 export SHIM_BASE_DIR=$dir
 
 sudo -E PATH=$PATH $bin_path/firecracker-containerd --config $dir/config.toml &

.buildkite/pipeline.yml

@@ -98,23 +98,25 @@ steps:
       DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
       NUMBER_OF_VMS: 100
       EXTRAGOARGS: "-v -count=1 -race"
+      FICD_DM_VOLUME_GROUP: fcci-vg
     artifact_paths:
       - "runtime/logs/*"
     command:
-      - make -C runtime integ-test FICD_SNAPSHOTTER=devmapper FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_runtime
+      - make -C runtime integ-test FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_runtime
     timeout_in_minutes: 15
 
-  - label: ":rotating_light: :exclamation: example tests (devmapper)"
+  - label: ":rotating_light: :exclamation: example tests"
     agents:
       queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
       distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
       hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
     env:
       DOCKER_IMAGE_TAG: "$BUILDKITE_BUILD_NUMBER"
       EXTRAGOARGS: "-v -count=1"
+      FICD_DM_VOLUME_GROUP: fcci-vg
     artifact_paths:
       - "examples/logs/*"
     command:
-      - make -C examples integ-test TEST_SS=devmapper TEST_POOL=build_${BUILDKITE_BUILD_NUMBER}_example
+      - make -C examples integ-test TEST_POOL=build_${BUILDKITE_BUILD_NUMBER}_example
     timeout_in_minutes: 10
 

examples/Makefile

@@ -41,17 +41,17 @@ integ-test:
 		--volume $(CURDIR)/etc/containerd/firecracker-runtime.json:/etc/containerd/firecracker-runtime.json \
 		--volume $(CURDIR)/logs:/var/log/firecracker-containerd-test \
 		--volume $(CURDIR)/..:/src \
-		--env FICD_SNAPSHOTTER=$(TEST_SS) \
+		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(TEST_POOL) \
 		--env EXTRAGOARGS="${EXTRAGOARGS}" \
 		--workdir="/src/examples" \
 		$(FIRECRACKER_CONTAINERD_TEST_IMAGE):${DOCKER_IMAGE_TAG} \
-		"make examples && make testtap && sleep 3 && ./taskworkflow -ip $(TEST_IP)$(TEST_SUBNET) -gw $(TEST_GATEWAY) -ss $(TEST_SS)"
+		"make examples && make testtap && sleep 3 && ./taskworkflow -ip $(TEST_IP)$(TEST_SUBNET) -gw $(TEST_GATEWAY) -ss devmapper"
 
 TEST_GATEWAY?=172.16.0.1
 TEST_IP?=172.16.0.2
 TEST_SUBNET?=/24
-TEST_SS?=devmapper
+FICD_DM_VOLUME_GROUP?=
 TEST_POOL?=
 testtap:
 	ip link add br0 type bridge

runtime/Makefile

@@ -62,7 +62,7 @@ integ-test-%: logs
 		--volume $(CURDIR)/..:/src \
 		--volume $(GO_CACHE_VOLUME_NAME):/go \
 		--env ENABLE_ISOLATED_TESTS=1 \
-		--env FICD_SNAPSHOTTER=$(FICD_SNAPSHOTTER) \
+		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(FICD_DM_POOL) \
 		--env GOPROXY=direct \
 		--env GOSUMDB=off \
@@ -81,7 +81,7 @@ PERF_RUNTIME_SECONDS?=600
 PERF_VM_MEMSIZE_MB?=1024
 PERF_TARGET_BANDWIDTH?=1G
 
-FICD_SNAPSHOTTER?=devmapper
+FICD_DM_VOLUME_GROUP?=
 FICD_DM_POOL?=
 
 tc-redirect-tap-perf:
@@ -109,7 +109,7 @@ perf-test:
 		--env PERF_RUNTIME_SECONDS=$(PERF_RUNTIME_SECONDS) \
 		--env PERF_VM_MEMSIZE_MB=$(PERF_VM_MEMSIZE_MB) \
 		--env PERF_TARGET_BANDWIDTH=$(PERF_TARGET_BANDWIDTH) \
-		--env FICD_SNAPSHOTTER=$(FICD_SNAPSHOTTER) \
+		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(FICD_DM_POOL) \
 		--env GOPROXY=direct \
 		--env GOSUMDB=off \

runtime/cni_integ_test.go

@@ -53,7 +53,7 @@ func TestCNISupport_Isolated(t *testing.T) {
 	pluginClient, err := ttrpcutil.NewClient(containerdSockPath + ".ttrpc")
 	require.NoError(t, err, "failed to create ttrpc client")
 
-	image, err := alpineImage(ctx, client, defaultSnapshotterName())
+	image, err := alpineImage(ctx, client, defaultSnapshotterName)
 	require.NoError(t, err, "failed to get alpine image")
 
 	numVMs := 5
@@ -127,7 +127,7 @@ func TestCNISupport_Isolated(t *testing.T) {
 
 			newContainer, err := client.NewContainer(ctx,
 				containerName,
-				containerd.WithSnapshotter(defaultSnapshotterName()),
+				containerd.WithSnapshotter(defaultSnapshotterName),
 				containerd.WithNewSnapshot(snapshotName, image),
 				containerd.WithNewSpec(
 					oci.WithProcessArgs("/usr/bin/wget",
@@ -160,7 +160,7 @@ func TestAutomaticCNISupport_Isolated(t *testing.T) {
 	require.NoError(t, err, "unable to create client to containerd service at %s, is containerd running?", containerdSockPath)
 	defer client.Close()
 
-	image, err := alpineImage(ctx, client, defaultSnapshotterName())
+	image, err := alpineImage(ctx, client, defaultSnapshotterName)
 	require.NoError(t, err, "failed to get alpine image")
 
 	numVMs := 5
@@ -194,7 +194,7 @@ func TestAutomaticCNISupport_Isolated(t *testing.T) {
 
 			newContainer, err := client.NewContainer(ctx,
 				taskID,
-				containerd.WithSnapshotter(defaultSnapshotterName()),
+				containerd.WithSnapshotter(defaultSnapshotterName),
 				containerd.WithNewSnapshot(snapshotName, image),
 				containerd.WithNewSpec(
 					oci.WithProcessArgs("/usr/bin/wget",
@@ -237,7 +237,7 @@ func TestCNIPlugin_Performance(t *testing.T) {
 
 	fcClient := fccontrol.NewFirecrackerClient(pluginClient.Client())
 
-	image, err := iperf3Image(ctx, client, defaultSnapshotterName())
+	image, err := iperf3Image(ctx, client, defaultSnapshotterName)
 	require.NoError(t, err, "failed to get iperf3 image")
 
 	cniNetworkName := "fcnet"
@@ -296,7 +296,7 @@ func TestCNIPlugin_Performance(t *testing.T) {
 
 			newContainer, err := client.NewContainer(ctx,
 				containerName,
-				containerd.WithSnapshotter(defaultSnapshotterName()),
+				containerd.WithSnapshotter(defaultSnapshotterName),
 				containerd.WithNewSnapshot(snapshotName, image),
 				containerd.WithNewSpec(
 					oci.WithProcessArgs("/usr/bin/iperf3",

runtime/integ_test.go

@@ -55,13 +55,8 @@ func shimBaseDir() string {
 	return defaultShimBaseDir
 }
 
-func defaultSnapshotterName() string {
-	if name := os.Getenv("FICD_SNAPSHOTTER"); name != "" {
-		return name
-	}
-
-	return "devmapper"
-}
+// devmapper is the only snapshotter we can use with Firecracker
+const defaultSnapshotterName = "devmapper"
 
 func prepareIntegTest(t *testing.T, options ...func(*config.Config)) {
 	t.Helper()

runtime/jailer_integ_test.go

@@ -52,7 +52,7 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
 
 	ctx := namespaces.WithNamespace(context.Background(), "default")
 
-	image, err := alpineImage(ctx, client, defaultSnapshotterName())
+	image, err := alpineImage(ctx, client, defaultSnapshotterName)
 	require.NoError(err, "failed to get alpine image")
 
 	pluginClient, err := ttrpcutil.NewClient(containerdSockPath + ".ttrpc")
@@ -69,7 +69,7 @@ func testJailer(t *testing.T, jailerConfig *proto.JailerConfig) {
 
 	c, err := client.NewContainer(ctx,
 		"container",
-		containerd.WithSnapshotter(defaultSnapshotterName()),
+		containerd.WithSnapshotter(defaultSnapshotterName),
 		containerd.WithNewSnapshot("snapshot", image),
 		containerd.WithNewSpec(oci.WithProcessArgs("/bin/echo", "-n", "hello"), firecrackeroci.WithVMID(vmID)),
 	)

runtime/limits_integ_test.go

@@ -35,7 +35,7 @@ func TestDiskLimit_Isolated(t *testing.T) {
 	require.NoError(err, "unable to create client to containerd service at %s, is containerd running?", containerdSockPath)
 	defer client.Close()
 
-	image, err := alpineImage(ctx, client, defaultSnapshotterName())
+	image, err := alpineImage(ctx, client, defaultSnapshotterName)
 	require.NoError(err, "failed to get alpine image")
 
 	// Right now, both naive snapshotter and devmapper snapshotter are configured to have 1024MB image size.
@@ -47,7 +47,7 @@ func TestDiskLimit_Isolated(t *testing.T) {
 
 	container, err := client.NewContainer(ctx,
 		"container",
-		containerd.WithSnapshotter(defaultSnapshotterName()),
+		containerd.WithSnapshotter(defaultSnapshotterName),
 		containerd.WithNewSnapshot("snapshot", image),
 		sh,
 	)