feat(libcontainer): Add tests for libcontainer in CI

Since we currently have 2 versions of urunc, we need to test both urunc
native way and the libcontainer one for the setup of the monitor's
execution environment setup To do that, repeat the vm_tests and kind
test by simply editing the urunc configuration enabling libcontainer.

We might want to check how to improve this in the future.

PR: #982
Signed-off-by: Charalampos Mainas <charalampos.mainas@gmail.com>
Reviewed-by: Anastassios Nanos <ananos@nubificus.co.uk>
Approved-by: Anastassios Nanos <ananos@nubificus.co.uk>

Author: cmainas

.github/workflows/kind_test.yml

@@ -335,6 +335,48 @@ jobs:
         grep "Hello world" /tmp/logs.txt
         kubectl describe pod hello-spt-rumprun-block || true
 
+      # Re-run the hello-world deployment with urunc's libcontainer runtime
+      # enabled, reusing the same kind cluster and urunc install.
+    - name: Deploy and verify with libcontainer
+      run: |
+        docker exec urunc-test-control-plane bash -c '
+          cat >> /etc/urunc/config.toml <<EOF
+
+        [runtime]
+        libcontainer = true
+        EOF
+        '
+        cat <<EOF | kubectl apply -f -
+            apiVersion: v1
+            kind: Pod
+            metadata:
+              name: hello-libcontainer
+              labels:
+                run: hello-libcontainer
+            spec:
+              runtimeClassName: urunc
+              restartPolicy: Never
+              containers:
+                - name: hello-libcontainer
+                  image: harbor.nbfc.io/nubificus/urunc/hello-spt-rumprun-block:latest
+                  imagePullPolicy: Always
+                  ports:
+                  - containerPort: 80
+                    protocol: TCP
+                  resources:
+                    requests:
+                      cpu: 10m
+        EOF
+        kubectl wait --for=condition=Succeeded pod/hello-libcontainer --timeout=180s || true
+        kubectl logs hello-libcontainer | tee /tmp/logs-libcontainer.txt
+        if ! grep "Hello world" /tmp/logs-libcontainer.txt; then
+          echo "=== LOGS (libcontainer) ==="
+          cat /tmp/logs-libcontainer.txt
+          kubectl describe pod hello-libcontainer || true
+          exit 1
+        fi
+        kubectl describe pod hello-libcontainer || true
+
     - name: Debug pod failure
       if: failure()
       run: |

.github/workflows/vm_test.yml

@@ -376,6 +376,24 @@ jobs:
           sudo -E env "PATH=$PATH" "GOROOT=$GOROOT" make ${{ matrix.test }}
         fi
 
+      # Re-run the same suite with urunc's libcontainer runtime enabled,
+      # changing the configuration.
+    - name: Run ${{ matrix.test }} with libcontainer
+      id: test_libcontainer
+      run: |
+        sudo tee -a /etc/urunc/config.toml > /dev/null <<'EOF'
+
+        [runtime]
+        libcontainer = true
+        EOF
+        export GOROOT=$(go env GOROOT)
+        export PATH="$GOROOT/bin:$PATH"
+        if [ "${{ matrix.arch }}" = "arm64" ]; then
+          sudo -E env "PATH=$PATH" "GOROOT=$GOROOT" make ${{ matrix.test }}_Spt
+        else
+          sudo -E env "PATH=$PATH" "GOROOT=$GOROOT" make ${{ matrix.test }} SKIP="Firecracker-unikraft-httpreply-static-net"
+        fi
+
     - name: Dump urunc logs on failure
       if: failure()
       run: |

Makefile

@@ -52,6 +52,10 @@ CGO            := CGO_ENABLED=1
 NOCGO          := CGO_ENABLED=0
 TEST_FLAGS     := "-count=1"
 TEST_OPTS      += -timeout 20m
+# Skip the execution of a test
+#   make test_crictl SKIP="Firecracker-unikraft-httpreply-static-net"
+#   make test_crictl SKIP="Crictl.*(CaseA|CaseB)"
+GINKGO_SKIP    := $(if $(SKIP),--ginkgo.skip="$(SKIP)")
 BUILD_TAGS     ?= netgo osusergo
 
 # Linking variables
@@ -273,56 +277,56 @@ test_unikernels:
 .PHONY: test_nerdctl
 test_nerdctl:
 	@echo "Testing nerdctl"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Nerdctl"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Nerdctl" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_ctr Run all end-to-end tests with ctr
 .PHONY: test_ctr
 test_ctr:
 	@echo "Testing ctr"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Ctr"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Ctr" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_crictl Run all end-to-end tests with crictl
 .PHONY: test_crictl
 test_crictl:
 	@echo "Testing crictl"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Crictl"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Crictl" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_docker Run all end-to-end tests with docker
 .PHONY: test_docker
 test_docker:
 	@echo "Testing docker"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Docker"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -run TestE2E -v --ginkgo.v --ginkgo.focus="Docker" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_nerdctl_[pattern] Run all end-to-end tests with nerdctl that match pattern
 .PHONY: test_nerdctl_%
 test_nerdctl_%:
 	@echo "Testing nerdctl"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Nerdctl.*$*"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Nerdctl.*$*" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_ctr_[pattern] Run all end-to-end tests with ctr that match pattern
 .PHONY: test_ctr_%
 test_ctr_%:
 	@echo "Testing ctr"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Ctr.*$*"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Ctr.*$*" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_crictl_[pattern] Run all end-to-end tests with crictl that match pattern
 .PHONY: test_crictl_%
 test_crictl_%:
 	@echo "Testing crictl"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Crictl.*$*"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Crictl.*$*" $(GINKGO_SKIP)
 	@echo " "
 
 ## test_docker_[pattern] Run all end-to-end tests with docker that match pattern
 .PHONY: test_docker_%
 test_docker_%:
 	@echo "Testing docker"
-	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Docker.*$*"
+	@GOFLAGS=$(TEST_FLAGS) $(GO) test $(TEST_OPTS) ./tests/e2e -v --ginkgo.v -run TestE2E --ginkgo.focus="Docker.*$*" $(GINKGO_SKIP)
 	@echo " "
 
 ## help Show this help message