ci: run test-integration target for all runtimes

samuelkarp · samuelkarp · commit e7a060097247 · 2020-11-03T17:08:13.000-08:00
Signed-off-by: Samuel Karp &lt;skarp@amazon.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,6 +78,11 @@ jobs:
   linux-build-and-test:
     name: Build, Unit, Integration, and CRI (linux amd64)
     runs-on: ubuntu-18.04
+
+    strategy:
+      matrix:
+        runtime: [io.containerd.runtime.v1.linux, io.containerd.runc.v1, io.containerd.runc.v2]
+
     steps:
       - name: Install Go
         uses: actions/setup-go@v1
@@ -122,8 +127,10 @@ jobs:
         working-directory: ${{github.workspace}}/src/github.com/containerd/cri
 
       - name: Integration Test
+        env:
+          TEST_RUNTIME: ${{ matrix.runtime }}
         run: |
-          make test-integration
+          CONTAINERD_RUNTIME=$TEST_RUNTIME make test-integration
         working-directory: ${{github.workspace}}/src/github.com/containerd/cri
 
       - name: Upload Integration Log File
diff --git a/hack/test-utils.sh b/hack/test-utils.sh
@@ -23,13 +23,24 @@ CONTAINERD_FLAGS="--log-level=debug "
 
 # Use a configuration file for containerd.
 CONTAINERD_CONFIG_FILE=${CONTAINERD_CONFIG_FILE:-""}
-if [ -z "${CONTAINERD_CONFIG_FILE}" ] && command -v sestatus >/dev/null 2>&1; then
-  selinux_config="/tmp/containerd-config-selinux.toml"
-  cat >${selinux_config} <<<'
+# The runtime to use (ignored when CONTAINERD_CONFIG_FILE is set)
+CONTAINERD_RUNTIME=${CONTAINERD_RUNTIME:-""}
+if [ -z "${CONTAINERD_CONFIG_FILE}" ]; then
+  config_file="/tmp/containerd-config-cri.toml"
+  truncate --size 0 "${config_file}"
+  if command -v sestatus >/dev/null 2>&1; then
+    cat >>${config_file} <<EOF
 [plugins.cri]
   enable_selinux = true
-'
-  CONTAINERD_CONFIG_FILE=${CONTAINERD_CONFIG_FILE:-"${selinux_config}"}
+EOF
+  fi
+  if [ -n "${CONTAINERD_RUNTIME}" ]; then
+    cat >>${config_file} <<EOF
+[plugins.cri.containerd.default_runtime]
+  runtime_type="${CONTAINERD_RUNTIME}"
+EOF
+  fi
+  CONTAINERD_CONFIG_FILE="${config_file}"
 fi
 
 # CONTAINERD_TEST_SUFFIX is the suffix appended to the root/state directory used
