[release-0.64] Bump kubevirtci (#1129)

* cluster: Bump k8s and kubevirtci (#1014) Latest stable k8s is 1.23 and latest kubevirtci included fixed NetworkManager and openvswitch. Signed-off-by: Quique Llorente <[email protected]> * cluster-up: restart NetworkManager (#1035) Signed-off-by: Radim Hrazdil <[email protected]> Signed-off-by: Quique Llorente <[email protected]> Signed-off-by: Radim Hrazdil <[email protected]> Co-authored-by: Enrique Llorente Pastora <[email protected]>
nmstate · Oct 31, 2022 · fe3078a · fe3078a
1 parent 614d74f
commit fe3078a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ WHAT ?= ./pkg/... ./controllers/...
 
 unit_test_args ?=  -r -keep-going --randomize-all --randomize-suites --race --trace $(UNIT_TEST_ARGS)
 
-export KUBEVIRT_PROVIDER ?= k8s-1.21
+export KUBEVIRT_PROVIDER ?= k8s-1.23
 export KUBEVIRT_NUM_NODES ?= 2 # 1 control-plane, 1 worker needed for e2e tests
 export KUBEVIRT_NUM_SECONDARY_NICS ?= 2
 

diff --git a/cluster/kubevirtci.sh b/cluster/kubevirtci.sh
@@ -1,5 +1,5 @@
-export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.21'}
-export KUBEVIRTCI_TAG='2108251059-2c2862b'
+export KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-'k8s-1.23'}
+export KUBEVIRTCI_TAG='2203222209-7c38b02'
 
 KUBEVIRTCI_REPO='https://github.com/kubevirt/kubevirtci.git'
 KUBEVIRTCI_PATH="${PWD}/_kubevirtci"

diff --git a/cluster/up.sh b/cluster/up.sh
@@ -21,10 +21,8 @@ for node in $(./cluster/kubectl.sh get nodes --no-headers | awk '{print $1}'); d
     done
 done
 
-echo 'Installing Open vSwitch and NetworkManager 1.34 on nodes'
+echo 'Enabling and starting up openvswitch'
 for node in $(./cluster/kubectl.sh get nodes --no-headers | awk '{print $1}'); do
-    ./cluster/cli.sh ssh ${node} -- sudo dnf install -y centos-release-nfv-openvswitch
-    ./cluster/cli.sh ssh ${node} -- sudo dnf install -y openvswitch2.16 libibverbs NetworkManager-1.34.0 NetworkManager-ovs-1.34.0
     ./cluster/cli.sh ssh ${node} -- sudo systemctl daemon-reload
     ./cluster/cli.sh ssh ${node} -- sudo systemctl enable openvswitch
     ./cluster/cli.sh ssh ${node} -- sudo systemctl restart openvswitch