Skip to content

Commit

Permalink
No longer need to build out/gvisor-addon since it's built in the dock…
Browse files Browse the repository at this point in the history
…er image
  • Loading branch information
Priya Wadhwa committed Aug 8, 2019
1 parent ee4cbbb commit d5e4cc1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ test-pkg/%: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
go test -v -test.timeout=60m ./$* --tags="$(MINIKUBE_BUILD_TAGS)"

.PHONY: all
all: cross drivers e2e-cross out/gvisor-addon
all: cross drivers e2e-cross

.PHONY: drivers
drivers: out/docker-machine-driver-hyperkit out/docker-machine-driver-kvm2
Expand Down
4 changes: 2 additions & 2 deletions test/integration/containerd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func testGvisorRestart(t *testing.T) {
mk := NewMinikubeRunner(t, p, "--wait=false")
defer mk.TearDown(t)

stdout, stderr, err := mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock", "--vm-driver=kvm2")
stdout, stderr, err := mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock")
if err != nil {
t.Fatalf("failed to start minikube (for profile %s) failed : %v\nstdout: %s\nstderr: %s", p, err, stdout, stderr)
}
Expand All @@ -69,7 +69,7 @@ func testGvisorRestart(t *testing.T) {
deleteUntrustedWorkload(t, p)

mk.RunCommand("delete", true)
stdout, stderr, err = mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock", "--vm-driver=kvm2")
stdout, stderr, err = mk.Start("--container-runtime=containerd", "--docker-opt containerd=/var/run/containerd/containerd.sock")
if err != nil {
t.Fatalf("failed to start minikube (for profile %s) failed : %v \nstdout: %s \nstderr: %s", t.Name(), err, stdout, stderr)
}
Expand Down

0 comments on commit d5e4cc1

Please sign in to comment.