Add critest as step to buildkite pipeline.

Signed-off-by: Gavin Inglis <[email protected]>

Author: ginglis13

.buildkite/pipeline.yml

@@ -108,3 +108,15 @@ steps:
       - make -C examples integ-test TEST_POOL=build_${BUILDKITE_BUILD_NUMBER}_example
     timeout_in_minutes: 10
 
+  - label: ":rotating_light: cri conformance 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"
+      FICD_DM_VOLUME_GROUP: fcci-vg
+    command:
+      - make -C runtime critest FICD_DM_POOL=build_${BUILDKITE_BUILD_NUMBER}_critest
+    timeout_in_minutes: 10
+

runtime/Makefile

@@ -150,14 +150,18 @@ critest:
 		--volume /dev:/dev \
 		--volume /run/udev/control:/run/udev/control \
 		--volume $(CURDIR)/..:/src \
+		--volume $(CURDIR)/../examples/etc/containerd/firecracker-runtime.json:/etc/containerd/firecracker-runtime.json \
+		--volume $(CURDIR)/../tools/demo/fc-br0.interface:/etc/network/interfaces.d/fc-br0 \
+		--volume $(CURDIR)/logs:/var/log/firecracker-containerd-test \
 		--volume $(GO_CACHE_VOLUME_NAME):/go \
 		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(FICD_DM_POOL) \
 		--env GOPROXY=direct \
 		--env GOSUMDB=off \
+      	--env ACK_GINKGO_DEPRECATIONS=1.16.5 \
 		--workdir="/src/runtime" \
 		$(FIRECRACKER_CONTAINERD_TEST_IMAGE):$(DOCKER_IMAGE_TAG) \
-		"critest -runtime-endpoint unix:///run/firecracker-containerd/containerd.sock"
+		"make -C ../examples testtap && critest -runtime-endpoint unix:///run/firecracker-containerd/containerd.sock"
 
 clean:
 	- rm -f containerd-shim-aws-firecracker

tools/demo/fcnet.conflist

@@ -1,5 +1,5 @@
 {
-  "cniVersion": "0.4.0",
+  "cniVersion": "1.0.0",
   "name": "fcnet",
   "plugins": [
     {
@@ -21,6 +21,9 @@
     },
     {
       "type": "tc-redirect-tap"
+    },
+    {
+      "type": "loopback"
     }
   ]
 }

tools/docker/Dockerfile.integ-test

@@ -34,8 +34,7 @@ RUN mkdir -p \
 # installs so we can minimize re-runs of the time-expensive downloading of images.
 COPY tools/docker/config.toml /etc/containerd/config.toml
 COPY tools/docker/do_not_edit_for_firecracker-control.config.json /etc/containerd/firecracker-runtime.json
-COPY tools/docker/critest/10-mynet.conf /etc/cni/net.d
-COPY tools/docker/critest/99-loopback.conf /etc/cni/net.d
+COPY tools/demo/fcnet.conflist /etc/cni/net.d/10-fcnet.conflist
 
 RUN --mount=type=bind,source=firecracker-control/cmd/containerd,target=/src \
   make -C /src install && \

tools/docker/critest/10-mynet.conf

@@ -23,38 +23,17 @@ EOF
 cat > /etc/containerd/cri/criconfig.toml <<EOF
 version = 2
 [plugins]
-  # The 'plugins."io.containerd.grpc.v1.cri"' table contains all of the server options.
   [plugins."io.containerd.grpc.v1.cri"]
- 
-    # 'plugins."io.containerd.grpc.v1.cri".containerd' contains config related to containerd
     [plugins."io.containerd.grpc.v1.cri".containerd]
-
-      # snapshotter is the snapshotter used by containerd.
       snapshotter = "devmapper"
-
-      # default_runtime_name is the default runtime name to use.
       default_runtime_name = "containerd-shim-aws-firecracker"
 
-      # 'plugins."io.containerd.grpc.v1.cri".containerd.runtimes' is a map from CRI RuntimeHandler strings, which specify types
-      # of runtime configurations, to the matching configurations.
-      # In this example, 'runc' is the RuntimeHandler string to match.
       [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.containerd-shim-aws-firecracker]
-        # runtime_type is the runtime type to use in containerd.
-        # The default value is "io.containerd.runc.v2" since containerd 1.4.
-        # The default value was "io.containerd.runc.v1" in containerd 1.3, "io.containerd.runtime.v1.linux" in prior releases.
         runtime_type = "aws.firecracker"
-
-
-        # conf_dir is the directory in which the admin places a CNI conf.
-        # this allows a different CNI conf for the network stack when a different runtime is being used.
         cni_conf_dir = "/etc/cni/net.d"
 
-    # 'plugins."io.containerd.grpc.v1.cri".cni' contains config related to cni
     [plugins."io.containerd.grpc.v1.cri".cni]
-      # bin_dir is the directory in which the binaries for the plugin is kept.
       bin_dir = "/opt/cni/bin"
-
-      # conf_dir is the directory in which the admin places a CNI conf.
       conf_dir = "/etc/cni/net.d"
 
 [debug]