Skip to content

Commit

Permalink
Bring cirros images to the sandbox where the test runs
Browse files Browse the repository at this point in the history
  • Loading branch information
Artyom Lukianov authored and rmohr committed Mar 1, 2019
1 parent 0c5ec78 commit 298a207
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -115,8 +118,8 @@ builder-publish:
.PHONY: \
bazel-generate \
bazel-build \
bazel-build-images \
bazel-push-images \
bazel-tests \
build \
test \
clean \
Expand Down
1 change: 1 addition & 0 deletions pkg/virtctl/imageupload/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ go_test(
"imageupload_suite_test.go",
"imageupload_test.go",
],
data = ["@cirros_image//file"],
embed = [":go_default_library"],
deps = [
"//pkg/kubecli:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/virtctl/imageupload/imageupload_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = Describe("ImageUpload", func() {
pvcNamespace = "default"
pvcName = "test-pvc"
pvcSize = "500Mi"
imagePath = "../../../vendor/kubevirt.io/containerized-data-importer/tests/images/cirros-qcow2.img"
imagePath = "../../../external/cirros_image/file/downloaded"
)

var (
Expand Down

0 comments on commit 298a207

Please sign in to comment.