Update kubevirtci, 1.31 lanes (#3555)

* Bump kvci to latest

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Switch testing lanes to 1.31/1.30

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

* Retry seeding images

This fails often since the most recent kvci bump,
so let's retry

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

---------

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

automation/ceph-wffc.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.29
+export TARGET=k8s-1.30
 #ensure no hard coded cdi cr in tests.
 export RANDOM_CR=true
 export KUBEVIRT_STORAGE=rook-ceph-default

automation/ceph.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.29
+export TARGET=k8s-1.30
 #ensure no hard coded cdi cr in tests.
 export RANDOM_CR=true
 export KUBEVIRT_STORAGE=rook-ceph-default

automation/destructive.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.30
+export TARGET=k8s-1.31
 export KUBEVIRT_STORAGE=hpp
 export KUBEVIRT_DEPLOY_PROMETHEUS=true
 export CDI_E2E_FOCUS=Destructive

automation/istio.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.30
+export TARGET=k8s-1.31
 export KUBEVIRT_STORAGE=hpp
 export CDI_E2E_SKIP=Destructive
 export KUBEVIRT_DEPLOY_ISTIO=true

automation/latest-hpp.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.30
+export TARGET=k8s-1.31
 export KUBEVIRT_STORAGE=hpp
 export CDI_E2E_SKIP=Destructive
 automation/test.sh

automation/nfs.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.30
+export TARGET=k8s-1.31
 export KUBEVIRT_DEPLOY_NFS_CSI=true
 export KUBEVIRT_STORAGE=nfs
 export CDI_E2E_SKIP=Destructive

automation/non-csi-hpp.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.30
+export TARGET=k8s-1.31
 export KUBEVIRT_STORAGE=hpp
 export HPP_CLASSIC=true
 export CDI_E2E_SKIP=Destructive

automation/previous-hpp.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.29
+export TARGET=k8s-1.30
 export KUBEVIRT_STORAGE=hpp
 export KUBEVIRT_DEPLOY_PROMETHEUS=true
 export CDI_E2E_SKIP=Destructive

automation/upgrade.sh

@@ -18,7 +18,7 @@
 #
 
 set -ex
-export TARGET=k8s-1.30
+export TARGET=k8s-1.31
 export KUBEVIRT_STORAGE=hpp
 export MULTI_UPGRADE=true
 export CDI_E2E_SKIP=Destructive

cluster-sync/ephemeral_provider.sh

@@ -17,7 +17,7 @@ function seed_images(){
 
   # We don't need to seed the nodes, but in the case of the default dev setup we'll just leave this here
   for i in $(seq 1 ${KUBEVIRT_NUM_NODES}); do
-      ./cluster-up/ssh.sh "node$(printf "%02d" ${i})" "echo \"${container}\" | xargs \-\-max-args=1 sudo crictl pull"
+      until ./cluster-up/ssh.sh "node$(printf "%02d" ${i})" "echo \"${container}\" | xargs \-\-max-args=1 sudo crictl pull"; do sleep 1; done
       # Temporary until image is updated with provisioner that sets this field
       # This field is required by buildah tool
       ./cluster-up/ssh.sh "node$(printf "%02d" ${i})" "sudo sysctl \-w user.max_user_namespaces=1024"

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

cluster-up/cluster/ephemeral-provider-common.sh

@@ -138,10 +138,18 @@ function _add_common_params() {
         params=" --single-stack $params"
     fi
 
+    if [ $KUBEVIRT_NO_ETCD_FSYNC == "true" ]; then
+        params=" --no-etcd-fsync $params"
+    fi
+
     if [ $KUBEVIRT_ENABLE_AUDIT == "true" ]; then
         params=" --enable-audit $params"
     fi
 
+    if [ $KUBVIRT_WITH_CNAO_SKIP_CONFIG == "true" ]; then
+        params=" --skip-cnao-cr $params"
+    fi
+
     if [ $KUBEVIRT_DEPLOY_NFS_CSI == "true" ]; then
         params=" --enable-nfs-csi $params"
     fi
@@ -181,6 +189,59 @@ function _add_common_params() {
         params=" --enable-fips $params"
     fi
 
+    if [ "$KUBEVIRT_WITH_MULTUS_V3" == "true" ]; then
+        params=" --deploy-multus $params"
+    fi
+
+    if [ "$KUBEVIRT_WITH_CNAO" == "true" ]; then
+        params=" --enable-cnao $params"
+    fi
+
+    if [ "$KUBEVIRT_DEPLOY_CDI" == "true" ]; then
+        params=" --deploy-cdi $params"
+    fi
+
+    if [ -n "$KUBEVIRT_CUSTOM_CDI_VERSION" ]; then
+        params=" --cdi-version=$KUBEVIRT_CUSTOM_CDI_VERSION $params"
+    fi
+
+    if [ "$KUBEVIRT_DEPLOY_AAQ" == "true" ]; then
+        params=" --deploy-aaq $params"
+    fi
+
+    if [ -n "$KUBEVIRT_CUSTOM_AAQ_VERSION" ]; then
+        params=" --aaq-version=$KUBEVIRT_CUSTOM_AAQ_VERSION $params"
+    fi
+
+    if [ "$KUBEVIRT_KSM_ON" == "true" ]; then
+        params=" --enable-ksm $params"
+    fi
+
+    if [ ! -z $KUBEVIRT_KSM_SLEEP_BETWEEN_SCANS_MS ]; then
+        params=" --ksm-scan-interval=$KUBEVIRT_KSM_SLEEP_BETWEEN_SCANS_MS $params"
+    fi
+
+    if [ ! -z $KUBEVIRT_KSM_PAGES_TO_SCAN ]; then
+        params=" --ksm-page-count=$KUBEVIRT_KSM_PAGES_TO_SCAN $params"
+    fi
+
+    if [ "$KUBEVIRT_SWAP_ON" == "true" ]; then
+        params=" --enable-swap $params"
+    fi
+
+    if [ ! -z $KUBEVIRT_SWAP_SIZE_IN_GB  ]; then
+        params=" --swap-size=$KUBEVIRT_SWAP_SIZE_IN_GB $params"
+    fi
+
+    if [ ! -z $KUBEVIRT_SWAPPINESS ]; then
+        params=" --swapiness=$KUBEVIRT_SWAPPINESS $params"
+    fi
+
+    if [ $KUBEVIRT_UNLIMITEDSWAP == "true" ]; then
+        params=" --unlimited-swap $params"
+    fi
+
+
     if [ -n "$KUBEVIRTCI_PROXY" ]; then
         params=" --docker-proxy=$KUBEVIRTCI_PROXY $params"
     fi

cluster-up/cluster/external/provider.sh

@@ -22,6 +22,15 @@ manifest_docker_prefix=\${DOCKER_PREFIX}
 image_pull_policy=\${IMAGE_PULL_POLICY:-Always}
 EOF
 
+    if [ -n "$KUBECTL" ]; then
+       echo "kubectl=${KUBECTL}" >> "$PROVIDER_CONFIG_FILE_PATH"
+    else
+       if which kubectl; then
+          echo "kubectl=$(which kubectl)" >> "$PROVIDER_CONFIG_FILE_PATH"
+       fi 
+    fi
+
+
     if which oc; then
         echo "oc=$(which oc)" >> "$PROVIDER_CONFIG_FILE_PATH"
     fi