From 3e611070b6a491fb5412f3445576964bdb81f447 Mon Sep 17 00:00:00 2001
From: Sylvain Baubeau <lebauce@gmail.com>
Date: Sat, 17 Jul 2021 22:00:08 +0200
Subject: [PATCH 1/2] k8s: do not check for cluster name in tests

---
 tests/k8s/deployment.yaml | 2 +-
 tests/k8s_test.go         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/k8s/deployment.yaml b/tests/k8s/deployment.yaml
index baafd82a08..17ad227e9d 100644
--- a/tests/k8s/deployment.yaml
+++ b/tests/k8s/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: skydive-test-deployment
diff --git a/tests/k8s_test.go b/tests/k8s_test.go
index 83ac843d33..a77c74cd32 100644
--- a/tests/k8s_test.go
+++ b/tests/k8s_test.go
@@ -197,7 +197,7 @@ func testNodeCreationFromConfig(t *testing.T, mngr, ty string, name interface{},
 
 /* -- test creation of single resource -- */
 func TestK8sClusterNode(t *testing.T) {
-	testNodeCreation(t, nil, nil, k8s.Manager, "cluster", getClusterName())
+	testNodeCreation(t, nil, nil, k8s.Manager, "cluster", nil)
 }
 
 func TestK8sConfigMapNode(t *testing.T) {

From 7146bcb45212617689c73aa4b0664709a467a56b Mon Sep 17 00:00:00 2001
From: Sylvain Baubeau <lebauce@gmail.com>
Date: Sat, 17 Jul 2021 22:00:28 +0200
Subject: [PATCH 2/2] ovnk8s: do not clean module cache at the end of the tests

---
 scripts/ci/ovnkube-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/ovnkube-setup.sh b/scripts/ci/ovnkube-setup.sh
index 8f1c0c404e..63b56379f3 100755
--- a/scripts/ci/ovnkube-setup.sh
+++ b/scripts/ci/ovnkube-setup.sh
@@ -62,6 +62,7 @@ do_create () {
         sudo firewall-cmd --reload
     fi
 
+    rm -rf $GOPATH/src/github.com/ovn-org
     mkdir -p $GOPATH/src/github.com/ovn-org/
     pushd $GOPATH/src/github.com/ovn-org/
       git clone $OVNK8S_REPO
@@ -84,7 +85,6 @@ do_create () {
 
 do_delete() {
     do_stop
-    go clean --modcache
     rm -rf ${WORKSPACE}/go/src/github.com/ovn-org/ovn-kubernetes
     docker rmi ovn-kube-f || true
     docker network rm kind || true