Skip to content

Commit 98546df

Browse files
Merge branch 'k8snetworkplumbingwg:main' into main
2 parents 6b4dbd7 + d5e0300 commit 98546df

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

automation/check-patch.e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ teardown() {
2828
}
2929

3030
main() {
31-
export KUBEVIRT_PROVIDER='k8s-1.26-centos9'
31+
export KUBEVIRT_PROVIDER='k8s-1.34'
3232

3333
source automation/setup.sh
3434
cd ${TMP_PROJECT_PATH}

cluster/cluster.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.26-centos9'}
16-
export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2305081329-48e913c}
15+
export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.34'}
16+
export KUBEVIRTCI_TAG=${KUBEVIRTCI_TAG:-2509181951-8264c60a}
1717

1818
KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'
1919
# The CLUSTER_PATH var is used in cluster folder and points to the _kubevirtci where the cluster is deployed from.

hack/bump-kubevirtci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
KUBEVIRTCI_TAG=$(curl -L -Ss https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirtci/latest)
20-
[[ ${#KUBEVIRTCI_TAG} != "18" ]] && echo "error getting KUBEVIRTCI_TAG" && exit 1
20+
[[ ${#KUBEVIRTCI_TAG} != "19" ]] && echo "error getting KUBEVIRTCI_TAG" && exit 1
2121

2222
sed -i "s/\(KUBEVIRTCI_TAG:-\)[^}]*/\1${KUBEVIRTCI_TAG}/" cluster/cluster.sh
2323

hack/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ KUBEVIRT_DIR="$(
2323
VENDOR_DIR=$KUBEVIRT_DIR/vendor
2424

2525

26-
KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-multus-1.12.2}
26+
KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.34}
2727
KUBEVIRT_NUM_NODES=${KUBEVIRT_NUM_NODES:-1}
2828
KUBEVIRT_MEMORY_SIZE=${KUBEVIRT_MEMORY_SIZE:-5120M}
2929

0 commit comments

Comments
 (0)