Merge pull request #366 from mxpv/ss-tests

Remove mention of naive snapshotter from examples and tests

Author: mxpv

examples/Makefile

@@ -51,7 +51,7 @@ integ-test:
 TEST_GATEWAY?=172.16.0.1
 TEST_IP?=172.16.0.2
 TEST_SUBNET?=/24
-TEST_SS?=naive
+TEST_SS?=devmapper
 TEST_POOL?=
 testtap:
 	ip link add br0 type bridge

examples/taskworkflow.go

@@ -46,15 +46,11 @@ const (
 func main() {
 	var containerCIDR = flag.String("ip", "", "ip address and subnet assigned to the container in CIDR notation. Example: -ip 172.16.0.2/24")
 	var gatewayIP = flag.String("gw", "", "gateway ip address. Example: -gw 172.16.0.1")
-	var snapshotter = flag.String("ss", "", "snapshotter")
+	var snapshotter = flag.String("ss", "devmapper", "snapshotter")
 
 	log.SetFlags(log.Ldate | log.Ltime | log.Lmicroseconds)
 	flag.Parse()
 
-	if *snapshotter == "naive" {
-		*snapshotter = "firecracker-naive"
-	}
-
 	if *containerCIDR != "" && *gatewayIP == "" {
 		log.Fatal("Incorrect usage. 'gw' needs to be specified when 'ip' is specified")
 	}

examples/taskworkflow.md

@@ -1,6 +1,6 @@
 ### About
 The `taskworkfow.go` file contains code to pull and unpack a container image
-using the `naive` snaphotter, create a container and execute a task using the
+using the `devmapper` snaphotter, create a container and execute a task using the
 `firecracker-containerd` runtime.
 
 ### Building

runtime/Makefile

@@ -79,7 +79,7 @@ PERF_RUNTIME_SECONDS?=600
 PERF_VM_MEMSIZE_MB?=1024
 PERF_TARGET_BANDWIDTH?=1G
 
-FICD_SNAPSHOTTER?=naive
+FICD_SNAPSHOTTER?=devmapper
 FICD_DM_POOL?=
 
 tc-redirect-tap-perf:

runtime/integ_test.go

@@ -44,12 +44,11 @@ var defaultRuntimeConfig = config.Config{
 }
 
 func defaultSnapshotterName() string {
-	name := os.Getenv("FICD_SNAPSHOTTER")
-	if name == "" || name == "naive" {
-		return "firecracker-naive"
+	if name := os.Getenv("FICD_SNAPSHOTTER"); name != "" {
+		return name
 	}
 
-	return name
+	return "devmapper"
 }
 
 func prepareIntegTest(t *testing.T, options ...func(*config.Config)) {

tools/docker/Dockerfile.integ-test

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:experimental
-# Test image that starts up containerd and the naive snapshotter. The default CMD will drop to a bash shell. Overrides
+# Test image that starts up containerd and the devmapper snapshotter. The default CMD will drop to a bash shell. Overrides
 # to CMD will be provided appended to /bin/bash -c
 FROM golang:1.13-stretch
 ENV PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/go/bin"
@@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND="noninteractive"
 
 ARG FIRECRACKER_TARGET=x86_64-unknown-linux-musl
 ENV FICD_LOG_DIR="/var/log/firecracker-containerd-test"
-ENV FICD_SNAPSHOTTER="naive"
+ENV FICD_SNAPSHOTTER="devmapper"
 ENV FICD_SNAPSHOTTER_OUTFILE="${FICD_LOG_DIR}/snapshotter.out"
 ENV FICD_CONTAINERD_OUTFILE="${FICD_LOG_DIR}/containerd.out"
 
@@ -26,7 +26,6 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
 RUN mkdir -p \
     /var/run/firecracker-containerd \
     /src \
-    /var/lib/firecracker-containerd/naive \
     /srv/firecracker_containerd_tests \
     ${FICD_LOG_DIR}