diff --git a/cluster-up-sha.txt b/cluster-up-sha.txt index 06a611821c3a..d265e5112ddb 100644 --- a/cluster-up-sha.txt +++ b/cluster-up-sha.txt @@ -1 +1 @@ -74996d86ab0b5449971013c693c4ad4779369eb5 +3b670847f28e4e217016065c759add3015c8e23a diff --git a/cluster-up/cluster/k8s-provider-common.sh b/cluster-up/cluster/k8s-provider-common.sh index 8c2b245ee7b7..ceb332073240 100644 --- a/cluster-up/cluster/k8s-provider-common.sh +++ b/cluster-up/cluster/k8s-provider-common.sh @@ -141,7 +141,7 @@ function copy_istio_cni_conf_files() { function deploy_cdi() { if [ "$KUBEVIRT_DEPLOY_CDI" == "true" ]; then if [ -n "${KUBEVIRT_CUSTOM_CDI_VERSION}" ]; then - $ssh node01 -- 'sudo sed --regexp-extended -i s/v[0-9]+\.[0-9]+\.[0-9]+(.*)?$/'"$KUBEVIRT_CUSTOM_CDI_VERSION"'/g /opt/cdi-*-operator.yaml' + $ssh node01 -- 'sudo sed --regexp-extended -i s/v[0-9]+\.[0-9]+\.[0-9]+\(.*\)?$/'"$KUBEVIRT_CUSTOM_CDI_VERSION"'/g /opt/cdi-*-operator.yaml' fi $kubectl create -f /opt/cdi-*-operator.yaml diff --git a/cluster-up/hack/common.sh b/cluster-up/hack/common.sh index c5d1932402d9..5af80f0a7bd9 100644 --- a/cluster-up/hack/common.sh +++ b/cluster-up/hack/common.sh @@ -48,4 +48,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=2307271141-09d7a5a +KUBEVIRTCI_TAG=2308051548-e616a72 diff --git a/cluster-up/version.txt b/cluster-up/version.txt index d3c2e18db09c..a2636f6c9e45 100644 --- a/cluster-up/version.txt +++ b/cluster-up/version.txt @@ -1 +1 @@ -2307271141-09d7a5a +2308051548-e616a72 diff --git a/hack/config-default.sh b/hack/config-default.sh index 786736e2b28e..95fe3fc0a1a0 100644 --- a/hack/config-default.sh +++ b/hack/config-default.sh @@ -11,7 +11,7 @@ cdi_namespace=cdi image_pull_policy=${IMAGE_PULL_POLICY:-IfNotPresent} verbosity=${VERBOSITY:-2} package_name=${PACKAGE_NAME:-kubevirt-dev} -kubevirtci_git_hash="2307271141-09d7a5a" +kubevirtci_git_hash="2308051548-e616a72" conn_check_ipv4_address=${CONN_CHECK_IPV4_ADDRESS:-""} conn_check_ipv6_address=${CONN_CHECK_IPV6_ADDRESS:-""} conn_check_dns=${CONN_CHECK_DNS:-""}