From 9d7d45da12860abd95ad058a946ea28e0f9096d6 Mon Sep 17 00:00:00 2001
From: Isaac Dorfman <idorfman@redhat.com>
Date: Wed, 27 Apr 2022 15:26:15 +0300
Subject: [PATCH] added integration with the image-builder kubevirt image

---
 Makefile                   | 2 +-
 e2e/create-cluster_test.go | 4 ++--
 hack/functest.sh           | 4 ++--
 kubevirtci                 | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e2da4a873..1809f7905 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ $(KUSTOMIZE): # Build kustomize from tools folder.
 	$(MAKE) -C $(ROOT) kustomize
 
 # Define Docker related variables. Releases should modify and double check these vars.
-REGISTRY ?= localhost:5000
+REGISTRY ?= 127.0.0.1:5000
 IMAGE_NAME ?= capk-manager
 CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
 ARCH ?= amd64
diff --git a/e2e/create-cluster_test.go b/e2e/create-cluster_test.go
index 0d67bccc3..9c57b3290 100644
--- a/e2e/create-cluster_test.go
+++ b/e2e/create-cluster_test.go
@@ -107,7 +107,7 @@ var _ = Describe("CreateCluster", func() {
 				}
 			}
 			return nil
-		}, 5*time.Minute, 5*time.Second).Should(Succeed(), "kubevirt machines should have bootstrap succeeded condition")
+		}, 10*time.Minute, 5*time.Second).Should(Succeed(), "kubevirt machines should have bootstrap succeeded condition")
 
 	}
 
@@ -275,7 +275,7 @@ var _ = Describe("CreateCluster", func() {
 			}
 
 			return nil
-		}, 10*time.Minute, 5*time.Second).Should(Succeed(), "cluster should have control plane initialized")
+		}, 15*time.Minute, 5*time.Second).Should(Succeed(), "cluster should have control plane initialized")
 	}
 
 	injectKubevirtClusterExternallyManagedAnnotation := func(yamlStr string) string {
diff --git a/hack/functest.sh b/hack/functest.sh
index 23aca0c81..7f1b5727b 100755
--- a/hack/functest.sh
+++ b/hack/functest.sh
@@ -13,10 +13,10 @@ echo "Building and installing capk manager container"
 
 echo "Running e2e test suite"
 export KUBECONFIG=$(./kubevirtci kubeconfig)
-export NODE_VM_IMAGE_TEMPLATE=quay.io/kubevirtci/fedora-kubeadm:35
+export NODE_VM_IMAGE_TEMPLATE=quay.io/capk/ubuntu-container-disk:20.04
 export IMAGE_REPO=k8s.gcr.io
 export TENANT_CLUSTER_KUBERNETES_VERSION=v1.21.0
-export CRI_PATH=/var/run/crio/crio.sock
+export CRI_PATH=/var/run/containerd/containerd.sock
 export ROOT_VOLUME_SIZE=23Gi
 export STORAGE_CLASS_NAME=rook-ceph-block
 make e2e-test
diff --git a/kubevirtci b/kubevirtci
index 1eb704766..49ba86690 100755
--- a/kubevirtci
+++ b/kubevirtci
@@ -78,7 +78,7 @@ function kubevirtci::down() {
 }
 
 function kubevirtci::build() {
-	export REGISTRY="localhost:$(cluster-up/cluster-up/cli.sh ports registry)"
+	export REGISTRY="127.0.0.1:$(cluster-up/cluster-up/cli.sh ports registry)"
 	make docker-build
 	make docker-push
 }
@@ -104,9 +104,9 @@ function kubevirtci::generate_kubeconfig() {
 }
 
 function kubevirtci::create_cluster() {
-	export NODE_VM_IMAGE_TEMPLATE=quay.io/kubevirtci/fedora-kubeadm:35
+	export NODE_VM_IMAGE_TEMPLATE=quay.io/capk/ubuntu-container-disk:20.04
 	export IMAGE_REPO=k8s.gcr.io
-	export CRI_PATH="/var/run/crio/crio.sock"
+	export CRI_PATH="/var/run/containerd/containerd.sock"
 	oc create secret generic external-infra-kubeconfig -n capk-system --from-file=kubeconfig=kubeconfig-e2e --from-literal=namespace=e2e-test
 	$CLUSTERCTL_PATH generate cluster kvcluster --kubernetes-version v1.21.0 --control-plane-machine-count=1 --worker-machine-count=1 --from templates/cluster-template-ext-infra.yaml | ${_kubectl} apply -f -
 }