diff --git a/automation/check-patch.e2e-lifecycle-k8s.sh b/automation/check-patch.e2e-lifecycle-k8s.sh index 85370b1bb..02616e3f3 100755 --- a/automation/check-patch.e2e-lifecycle-k8s.sh +++ b/automation/check-patch.e2e-lifecycle-k8s.sh @@ -18,6 +18,8 @@ versionChanged() { } main() { + export KUBEVIRT_PROVIDER='k8s-1.25' + source automation/check-patch.setup.sh cd ${TMP_PROJECT_PATH} diff --git a/automation/check-patch.e2e-monitoring-k8s.sh b/automation/check-patch.e2e-monitoring-k8s.sh index 5a70b08a0..4d25590b0 100755 --- a/automation/check-patch.e2e-monitoring-k8s.sh +++ b/automation/check-patch.e2e-monitoring-k8s.sh @@ -14,6 +14,8 @@ teardown() { } main() { + export KUBEVIRT_PROVIDER='k8s-1.25' + source automation/check-patch.setup.sh cd ${TMP_PROJECT_PATH} diff --git a/automation/check-patch.e2e-workflow-k8s.sh b/automation/check-patch.e2e-workflow-k8s.sh index a46ac9716..09318bee6 100755 --- a/automation/check-patch.e2e-workflow-k8s.sh +++ b/automation/check-patch.e2e-workflow-k8s.sh @@ -14,6 +14,8 @@ teardown() { } main() { + export KUBEVIRT_PROVIDER='k8s-1.25' + source automation/check-patch.setup.sh cd ${TMP_PROJECT_PATH} diff --git a/cluster/cluster.sh b/cluster/cluster.sh index c826dc0ea..d2e4187ea 100755 --- a/cluster/cluster.sh +++ b/cluster/cluster.sh @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.28'} -export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2406041642-8d359a3} +export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.25'} +export KUBEVIRTCI_TAG='2303201102-ef46217' KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git' # The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from. diff --git a/hack/bump-kubevirtci.sh b/hack/bump-kubevirtci.sh index 62c36c14e..72726a938 100755 --- a/hack/bump-kubevirtci.sh +++ b/hack/bump-kubevirtci.sh @@ -3,6 +3,6 @@ KUBEVIRTCI_TAG=$(curl -L -Ss https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirtci/latest) [[ ${#KUBEVIRTCI_TAG} != "18" ]] && echo "error getting KUBEVIRTCI_TAG" && exit 1 -sed -i "s/\(KUBEVIRTCI_TAG:-\)[^}]*/\1${KUBEVIRTCI_TAG}/" cluster/cluster.sh +sed -i "s/export KUBEVIRTCI_TAG=.*/export KUBEVIRTCI_TAG='${KUBEVIRTCI_TAG}'/g" cluster/cluster.sh git --no-pager diff cluster/cluster.sh | grep KUBEVIRTCI_TAG || true