Merge pull request kubevirt#2067 from cynepco3hahue/bazel_fix_tests

Bring cirros images to the sandbox where the test runs

.gitignore

@@ -33,3 +33,4 @@ tools/vms-generator/vms-generator
 coverage.html
 manifests/**/*.tmp
 bazel-*
+.bazelrc

.travis.yml

@@ -20,7 +20,7 @@ script:
 - make build
 - if [[ -n "$(git status --porcelain)" ]] ; then echo "It seems like you need to run
   `make`. Please run it and commit the changes"; git status --porcelain; false; fi
-- if [[ $TRAVIS_REPO_SLUG == "kubevirt/kubevirt" ]]; then make goveralls; else make test; fi
+- if [[ $TRAVIS_REPO_SLUG == "kubevirt/kubevirt" ]]; then make goveralls; else make bazel-tests; fi
 - make apidocs
 - make client-python
 - make manifests DOCKER_PREFIX="docker.io/kubevirt" DOCKER_TAG=$TRAVIS_TAG # falls back to latest if not on a tag

Makefile

@@ -20,6 +20,9 @@ bazel-push-images:
 		--define container_tag=${CONTAINER_TAG} \
 		//:push-images"
 
+bazel-tests:
+	hack/dockerized "bazel test --test_output=errors -- //pkg/... "
+
 generate: bazel-generate
 	hack/dockerized "DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY} VERBOSITY=${VERBOSITY} ./hack/generate.sh"
 
@@ -115,8 +118,8 @@ builder-publish:
 .PHONY: \
 	bazel-generate \
 	bazel-build \
-	bazel-build-images \
 	bazel-push-images \
+	bazel-tests \
 	build \
 	test \
 	clean \

hack/dockerized

@@ -13,7 +13,6 @@ SYNC_VENDOR=${SYNC_VENDOR:-false}
 
 TEMPFILE=".rsynctemp"
 
-# Reduce verbosity if an automated build
 BUILDER_EXTRA_ARGS=""
 if [ -n "${KUBEVIRT_CACHE_FROM}" ]; then
     BUILDER_EXTRA_ARGS="${BUILDER_EXTRA_ARGS} --cache-from kubevirt/builder-cache:${KUBEVIRT_CACHE_FROM}"
@@ -23,6 +22,13 @@ if [ -n "${KUBEVIRT_UPDATE_CACHE_FROM}" ]; then
     BUILDER_EXTRA_ARGS="${BUILDER_EXTRA_ARGS} -t kubevirt/builder-cache:${KUBEVIRT_UPDATE_CACHE_FROM}"
 fi
 
+# Be less verbose with bazel
+if [ -n "${TRAVIS_JOB_ID}" ]; then
+    cat >.bazelrc <<EOF
+common --noshow_progress --noshow_loading_progress
+EOF
+fi
+
 # Build the build container
 (cd ${DOCKER_DIR} && docker build . ${BUILDER_EXTRA_ARGS} -t ${BUILDER})
 

pkg/virtctl/imageupload/BUILD.bazel

@@ -28,6 +28,11 @@ go_test(
         "imageupload_suite_test.go",
         "imageupload_test.go",
     ],
+    args = [
+        "--cirros-image-path",
+        "$(location @cirros_image//file)",
+    ],
+    data = ["@cirros_image//file"],
     embed = [":go_default_library"],
     deps = [
         "//pkg/kubecli:go_default_library",

pkg/virtctl/imageupload/imageupload_test.go

@@ -1,17 +1,19 @@
 package imageupload_test
 
 import (
+	"flag"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -30,14 +32,22 @@ const (
 	podPhaseAnnotation      = "cdi.kubevirt.io/storage.pod.phase"
 )
 
-var _ = Describe("ImageUpload", func() {
+const (
+	pvcNamespace = "default"
+	pvcName      = "test-pvc"
+	pvcSize      = "500Mi"
+)
 
-	const (
-		pvcNamespace = "default"
-		pvcName      = "test-pvc"
-		pvcSize      = "500Mi"
-		imagePath    = "../../../vendor/kubevirt.io/containerized-data-importer/tests/images/cirros-qcow2.img"
-	)
+var imagePath string
+
+func init() {
+	// how could this ever happen that we have a 13MB blob in our repo?
+	flag.StringVar(&imagePath, "cirros-image-path", "vendor/kubevirt.io/containerized-data-importer/tests/images/cirros-qcow2.img", "path to cirros test image")
+	flag.Parse()
+	imagePath = filepath.Join("../../../", imagePath)
+}
+
+var _ = Describe("ImageUpload", func() {
 
 	var (
 		ctrl       *gomock.Controller
@@ -60,6 +70,7 @@ var _ = Describe("ImageUpload", func() {
 	})
 
 	addPodPhaseAnnotation := func() {
+		defer GinkgoRecover()
 		time.Sleep(10 * time.Millisecond)
 		pvc, err := kubeClient.CoreV1().PersistentVolumeClaims(pvcNamespace).Get(pvcName, metav1.GetOptions{})
 		Expect(err).To(BeNil())