Bump kubevirtci

[d4d136b K8s 1.30 provider slim s390x](kubevirt/kubevirtci#1252) [6c4fa8f crio: pin cri-o to previous minor version for each provider](kubevirt/kubevirtci#1320) [12789ee kind-1.28: add conformance.json](kubevirt/kubevirtci#1286) ```release-note NONE ``` Signed-off-by: kubevirt-bot <[email protected]>
DiMalovanyy · Nov 9, 2024 · 5fe999c · 5fe999c
1 parent 3e1774b
commit 5fe999c
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 12 deletions.
diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -37,7 +37,7 @@ cdi_namespace=cdi
 image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent}
 verbosity=${VERBOSITY:-2}
 package_name=${PACKAGE_NAME:-kubevirt-dev}
-kubevirtci_git_hash="2410291735-2e4b5e03"
+kubevirtci_git_hash="2411081234-d4d136be"
 conn_check_ipv4_address=${CONN_CHECK_IPV4_ADDRESS:-""}
 conn_check_ipv6_address=${CONN_CHECK_IPV6_ADDRESS:-""}
 conn_check_dns=${CONN_CHECK_DNS:-""}

diff --git a/kubevirtci/cluster-up-sha.txt b/kubevirtci/cluster-up-sha.txt
@@ -1 +1 @@
-90c7dabf342b957ef12381c6002768f9a33c6434
+fab310cc9bee24b80be00e72038abcc11e0164ac
diff --git a/kubevirtci/cluster-up/check.sh b/kubevirtci/cluster-up/check.sh
@@ -26,12 +26,17 @@ fi
 
 KVM_ARCH=""
 KVM_NESTED="unknown"
+KVM_HPAGE="unknown"
 if [ -f "/sys/module/kvm_intel/parameters/nested" ]; then
 	KVM_NESTED=$( cat /sys/module/kvm_intel/parameters/nested )
 	KVM_ARCH="intel"
 elif [ -f "/sys/module/kvm_amd/parameters/nested" ]; then
 	KVM_NESTED=$( cat /sys/module/kvm_amd/parameters/nested )
 	KVM_ARCH="amd"
+elif [ -f "/sys/module/kvm/parameters/nested" ]; then
+	KVM_NESTED=$( cat /sys/module/kvm/parameters/nested )
+	KVM_ARCH="s390x"
+	KVM_HPAGE=$( cat /sys/module/kvm/parameters/hpage )
 fi
 
 function is_enabled() {
@@ -49,3 +54,7 @@ if is_enabled "$KVM_NESTED"; then
 else
 	echo "[ERR ] $KVM_ARCH nested virtualization not enabled"
 fi
+
+if is_enabled "$KVM_HPAGE" && [ "$(uname -m)" = "s390x" ]; then
+	echo "[ERR ] $KVM_HPAGE KVM hugepage enabled. It needs to be disabled while nested virtualization is enabled for s390x"
+fi
diff --git a/kubevirtci/cluster-up/cluster/k8s-provider-common.sh b/kubevirtci/cluster-up/cluster/k8s-provider-common.sh
@@ -71,14 +71,8 @@ function up() {
     kubectl config set-cluster kubernetes --server="https://$(_main_ip):$(_port k8s)"
     kubectl config set-cluster kubernetes --insecure-skip-tls-verify=true
 
-    # Workaround https://github.com/containers/conmon/issues/315 by not dumping the file to stdout for the time being
-    if [[ ${_cri_bin} = podman* ]]; then
-        k8s_version=$(kubectl get node node01 --no-headers -o=custom-columns=VERSION:.status.nodeInfo.kubeletVersion)
-        curl -Ls "https://dl.k8s.io/release/${k8s_version}/bin/linux/amd64/kubectl" -o ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kubectl
-    else
-        ${_cli} scp --prefix ${provider_prefix:?} /usr/bin/kubectl - >${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kubectl
-    fi
-
+    ${_cli} scp --prefix ${provider_prefix:?} /usr/bin/kubectl - >${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kubectl
+
     chmod u+x ${KUBEVIRTCI_CONFIG_PATH}/$KUBEVIRT_PROVIDER/.kubectl
 
     # Make sure that local config is correct

diff --git a/kubevirtci/cluster-up/cluster/kind-1.28/conformance.json b/kubevirtci/cluster-up/cluster/kind-1.28/conformance.json
@@ -0,0 +1,47 @@
+{
+  "Description": "DEFAULT",
+  "UUID": "",
+  "Version": "v0.56.9",
+  "ResultsDir": "/tmp/sonobuoy/results",
+  "Resources": null,
+  "Filters": {
+    "Namespaces": ".*",
+    "LabelSelector": ""
+  },
+  "Limits": {
+    "PodLogs": {
+      "Namespaces": "kube-system",
+      "SonobuoyNamespace": true,
+      "FieldSelectors": [],
+      "LabelSelector": "",
+      "Previous": false,
+      "SinceSeconds": null,
+      "SinceTime": null,
+      "Timestamps": false,
+      "TailLines": null,
+      "LimitBytes": null
+    }
+  },
+  "QPS": 30,
+  "Burst": 50,
+  "Server": {
+    "bindaddress": "0.0.0.0",
+    "bindport": 8080,
+    "advertiseaddress": "",
+    "timeoutseconds": 21600
+  },
+  "Plugins": null,
+  "PluginSearchPath": [
+    "./plugins.d",
+    "/etc/sonobuoy/plugins.d",
+    "~/sonobuoy/plugins.d"
+  ],
+  "Namespace": "sonobuoy",
+  "WorkerImage": "sonobuoy/sonobuoy:v0.56.9",
+  "ImagePullPolicy": "IfNotPresent",
+  "ImagePullSecrets": "",
+  "AggregatorPermissions": "clusterAdmin",
+  "ServiceAccountName": "sonobuoy-serviceaccount",
+  "ProgressUpdatesPort": "8099",
+  "SecurityContextMode": "nonroot"
+}
diff --git a/kubevirtci/cluster-up/hack/common.sh b/kubevirtci/cluster-up/hack/common.sh
@@ -55,4 +55,4 @@ provider_prefix=${JOB_NAME:-${KUBEVIRT_PROVIDER}}${EXECUTOR_NUMBER}
 job_prefix=${JOB_NAME:-kubevirt}${EXECUTOR_NUMBER}
 
 mkdir -p $KUBEVIRTCI_CONFIG_PATH/$KUBEVIRT_PROVIDER
-KUBEVIRTCI_TAG=2410291735-2e4b5e03
+KUBEVIRTCI_TAG=2411081234-d4d136be
diff --git a/kubevirtci/cluster-up/version.txt b/kubevirtci/cluster-up/version.txt
@@ -1 +1 @@
-2410291735-2e4b5e03
+2411081234-d4d136be
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		90c7dabf342b957ef12381c6002768f9a33c6434
		fab310cc9bee24b80be00e72038abcc11e0164ac