Revert "kubevirtci: Bump version (kubevirt#1807)"

This reverts commit 8f67002.
nestoracunablanco · Sep 25, 2024 · 407ec04 · 407ec04
1 parent 63194a7
commit 407ec04
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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