Correct the usage of kubevirtci

.gitignore

@@ -3,7 +3,7 @@ aaq_controller
 aaq_operator
 aaq_server
 tmp
-_ci-configs/*
+kubevirtci/_ci-configs/*
 0
 bin/
 _out/*

Makefile

@@ -23,7 +23,8 @@
 		goveralls \
 		release-description \
 		bazel-build-images push-images \
-		fossa
+		fossa \
+		bump-kubevirtci
 all: build
 
 build:  aaq_controller aaq_server aaq_operator
@@ -39,10 +40,6 @@ else
 	DO_BAZ=eval
 endif
 
-ifeq ($(origin KUBEVIRT_RELEASE), undefined)
-	KUBEVIRT_RELEASE="latest_nightly"
-endif
-
 all: manifests build-images
 
 manifests:
@@ -59,10 +56,10 @@ generate-verify: generate
 	./hack/check-for-binaries.sh
 
 cluster-up:
-	eval "KUBEVIRT_RELEASE=${KUBEVIRT_RELEASE} ./cluster-up/up.sh"
+	./hack/cluster-up.sh
 
 cluster-down:
-	./cluster-up/down.sh
+	./kubevirtci/cluster-up/down.sh
 
 push-images:
 	eval "DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG}  ./hack/build/build-docker.sh push"
@@ -122,3 +119,6 @@ fmt:
 
 run: build
 	sudo ./aaq_controller
+
+bump-kubevirtci:
+	./hack/bump-kubevirtci.sh

README.md

@@ -224,14 +224,14 @@ Deploying the AAQ controller is straightforward.
 
 ### Deploy it with our CI system
 
-AAQ includes a self-contained development and test environment.  We use Docker to build, and we provide a simple way to get a test cluster up and running on your laptop. The development tools include a version of kubectl that you can use to communicate with the cluster. A wrapper script to communicate with the cluster can be invoked using ./cluster-up/kubectl.sh.
+AAQ includes a self-contained development and test environment.  We use Docker to build, and we provide a simple way to get a test cluster up and running on your laptop. The development tools include a version of kubectl that you can use to communicate with the cluster. A wrapper script to communicate with the cluster can be invoked using ./kubevirtci/cluster-up/kubectl.sh.
 
 ```bash
 $ mkdir $GOPATH/src/kubevirt.io && cd $GOPATH/src/kubevirt.io
 $ git clone https://github.com/kubevirt/application-aware-quota && cd application-aware-quota
 $ make cluster-up
 $ make cluster-sync
-$ ./cluster-up/kubectl.sh .....
+$ ./kubevirtci/cluster-up/kubectl.sh .....
 ```
 For development on external cluster (not provisioned by our AAQ),
 check out the [external provider](cluster-sync/external/README.md).

automation/test.sh

@@ -46,14 +46,14 @@ elif [[ $TARGET =~ k8s-.* ]]; then
   export KUBEVIRT_MEMORY_SIZE=8192
 fi
 
-if [ ! -d "cluster-up/cluster/$KUBEVIRT_PROVIDER" ]; then
+if [ ! -d "kubevirtci/cluster-up/cluster/$KUBEVIRT_PROVIDER" ]; then
   echo "The cluster provider $KUBEVIRT_PROVIDER does not exist"
   exit 1
 fi
 
 export KUBEVIRT_NUM_NODES=2
 
-kubectl() { cluster-up/kubectl.sh "$@"; }
+kubectl() { kubevirtci/cluster-up/kubectl.sh "$@"; }
 
 export AAQ_NAMESPACE="${AAQ_NAMESPACE:-aaq}"
 

cluster-sync/clean.sh

@@ -1,8 +1,9 @@
 #!/bin/bash -e
 
 source ./hack/build/config.sh
-source ./cluster-up/hack/common.sh
-source ./cluster-up/cluster/${KUBEVIRT_PROVIDER}/provider.sh
+source ./hack/config-kubevirtci.sh
+source ./kubevirtci/cluster-up/hack/common.sh
+source ./kubevirtci/cluster-up/cluster/${KUBEVIRT_PROVIDER}/provider.sh
 
 echo "Cleaning up ..."
 

cluster-sync/install.sh

@@ -22,4 +22,3 @@ function wait_aaq_crd_installed {
      exit 1
   fi  
 }
-

cluster-sync/sync.sh

@@ -7,8 +7,8 @@ echo aaq
 
 source ./hack/build/config.sh
 source ./hack/build/common.sh
-source ./cluster-up/hack/common.sh
-source ./cluster-up/cluster/${KUBEVIRT_PROVIDER}/provider.sh
+source ./kubevirtci/cluster-up/hack/common.sh
+source ./kubevirtci/cluster-up/cluster/${KUBEVIRT_PROVIDER}/provider.sh
 
 if [ "${KUBEVIRT_PROVIDER}" = "external" ]; then
    AAQ_SYNC_PROVIDER="external"