Merge pull request #22006 from medyagh/prowkvm_containerd

ci: add kvm containerd to prow test

Author: medyagh

hack/prow/integration_kvm_containerd_linux_x86-64.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Copyright 2025 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+set -x
+
+OS="linux"
+ARCH="amd64"
+DRIVER="kvm2"
+CONTAINER_RUNTIME="containerd"
+# in prow, if you want libvirtd to be run, you have to start a privileged container as root
+EXTRA_START_ARGS="" 
+EXTRA_TEST_ARGS=""
+JOB_NAME="KVM_Containerd_Linux_X86-64"
+#  marking all directories ('*') as trusted, since .git belongs to root, not minikube user
+git config --global --add safe.directory '*'
+COMMIT=$(git rev-parse HEAD)
+MINIKUBE_LOCATION=$COMMIT
+echo "running test in $(pwd)"
+
+set +e
+sleep 5  # wait for libvirtd to be running
+echo "=========libvirtd status=========="
+sudo systemctl status libvirtd
+echo "=========Check virtualization support=========="
+grep -E -q 'vmx|svm' /proc/cpuinfo && echo yes || echo no 
+echo "=========virt-host-validate=========="
+virt-host-validate
+
+set -e
+source ./hack/prow/common.sh 

…tegration_kvm_docker_linux_x86-64_pre.sh hack/prow/integration_pre_install.shhack/prow/integration_kvm_docker_linux_x86-64_pre.sh renamed to hack/prow/integration_pre_install.sh hack/prow/integration_kvm_docker_linux_x86-64_pre.sh renamed to hack/prow/integration_pre_install.sh

@@ -34,8 +34,9 @@ var deployers = map[string]func(string) deployer.MiniTestDeployer{
 	"docker": deployer.NewMiniTestDockerDeployerFromConfigFile,
 }
 var testers = map[string]tester.MiniTestTester{
-	"kvm-docker-linux-amd64-integration":  &tester.KVMDockerLinuxAmd64IntegrationTester{},
-	"none-docker-linux-amd64-integration": &tester.NoneDockerLinuxAmd64IntegrationTester{},
+	"kvm-docker-linux-amd64-integration":     &tester.KVMDockerLinuxAmd64IntegrationTester{},
+	"kvm-containerd-linux-amd64-integration": &tester.KVMContainerdLinuxAmd64IntegrationTester{},
+	"none-docker-linux-amd64-integration":    &tester.NoneDockerLinuxAmd64IntegrationTester{},
 }
 
 func main() {

hack/prow/minitest/main.go

@@ -0,0 +1,60 @@
+/*
+Copyright 2025 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tester
+
+import (
+	"fmt"
+	"os"
+
+	"k8s.io/klog/v2"
+)
+
+var _ MiniTestTester = &KVMDockerLinuxAmd64IntegrationTester{}
+
+// this runs the integration tests with kvm2 driver and a docker container runtime.
+type KVMContainerdLinuxAmd64IntegrationTester struct {
+}
+
+// Run implements MiniTestTester.
+func (k *KVMContainerdLinuxAmd64IntegrationTester) Run(runner MiniTestRunner) error {
+
+	if up, err := runner.IsUp(); err != nil || !up {
+		klog.Errorf("tester: deployed environment is not up: %v", err)
+	}
+	if err := runner.SyncToRemote(".", "~/minikube", []string{".cache"}); err != nil {
+		klog.Errorf("failed to sync file in docker deployer: %v", err)
+	}
+	pr := os.Getenv("PULL_NUMBER")
+
+	var testErr error
+	// install docker and libvirtd first then run the test in a new shell
+	if err := runner.Execute("cd minikube && ./hack/prow/integration_pre_install.sh"); err != nil {
+		klog.Errorf("failed to install docker in env: %v", err)
+		return err
+	}
+	if testErr = runner.Execute(fmt.Sprintf("cd minikube && PULL_NUMBER=\"%s\" ./hack/prow/integration_kvm_containerd_linux_x86-64.sh", pr)); testErr != nil {
+		klog.Errorf("failed to execute command in env: %v", testErr)
+		// don't return here, we still want to collect the test reports
+	}
+
+	// prow requires result file to be copied to $ARTIFACTS. All other files will not be persisted.
+	if err := copyFileToArtifact(runner); err != nil {
+		return err
+	}
+	return testErr
+
+}

hack/prow/minitest/tester/kvm_containerd_linux_amd64_integration.go

@@ -42,7 +42,7 @@ func (k *KVMDockerLinuxAmd64IntegrationTester) Run(runner MiniTestRunner) error
 
 	var testErr error
 	// install docker and libvirtd first then run the test in a new shell
-	if err := runner.Execute("cd minikube && ./hack/prow/integration_kvm_docker_linux_x86-64_pre.sh"); err != nil {
+	if err := runner.Execute("cd minikube && ./hack/prow/integration_pre_install.sh"); err != nil {
 		klog.Errorf("failed to install docker in env: %v", err)
 		return err
 	}

hack/prow/minitest/tester/kvm_docker_linux_amd64_integration.go

@@ -42,7 +42,7 @@ func (k *NoneDockerLinuxAmd64IntegrationTester) Run(runner MiniTestRunner) error
 
 	var testErr error
 	// install docker and libvirtd first then run the test in a new shell
-	if err := runner.Execute("cd minikube && ./hack/prow/integration_kvm_docker_linux_x86-64_pre.sh"); err != nil {
+	if err := runner.Execute("cd minikube && ./hack/prow/integration_pre_install.sh"); err != nil {
 		klog.Errorf("failed to install docker in env: %v", err)
 		return err
 	}

hack/prow/minitest/tester/none_docker_linux_amd64_integration.go

@@ -19,6 +19,11 @@ integration-prow-kvm-docker-linux-x86-64: setup-prow-gcp-ssh-keys build-mini-tes
 	./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
 	./out/minitest  --deployer boskos --tester kvm-docker-linux-amd64-integration --config hack/prow/bosksos-nested.json
 
+.PHONY: integration-prow-kvm-containerd-linux-x86-64
+integration-prow-kvm-containerd-linux-x86-64: setup-prow-gcp-ssh-keys build-mini-test
+	./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
+	./out/minitest  --deployer boskos --tester kvm-containerd-linux-amd64-integration --config hack/prow/bosksos-nested.json
+
 .PHONY: build-mini-test
 build-mini-test: # build minitest binary
 	GOTOOLCHAIN=auto go build -C ./hack/prow/minitest -o $(PWD)/out/minitest .