Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge repositories.json after extracting preloaded tarball so that reference store isn't lost #6985

Merged
merged 8 commits into from
Mar 12, 2020
Merged

Merge repositories.json after extracting preloaded tarball so that reference store isn't lost #6985

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fc922cb
Only extract preloaded tarball if images don't exist in daemon
Mar 10, 2020
de34dda
Rebased
Mar 10, 2020
68f2366
Add integration test
Mar 11, 2020
01f5300
merge reference stores if needed
Mar 11, 2020
3462c4c
Update integration test
Mar 11, 2020
a2e5a5e
removed unused unit test
Mar 11, 2020
701cf5c
Address nits
Mar 11, 2020
e45b230
Merge branch 'master' into no-overwrite-tar
tstromberg Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions test/integration/start_stop_delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,46 @@ func TestStartStop(t *testing.T) {
})
}

func TestStartStopWithPreload(t *testing.T) {
if NoneDriver() {
t.Skipf("skipping %s - incompatible with none driver", t.Name())
}

profile := UniqueProfileName("test-preload")
ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
defer CleanupWithLogs(t, profile, cancel)

startArgs := []string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", "-v=3", "--wait=true"}
priyawadhwa marked this conversation as resolved.
Show resolved Hide resolved
startArgs = append(startArgs, StartArgs()...)
k8sVersion := "v1.17.3"
startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", k8sVersion))

rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err)
}

// Now, pull the busybox image into the VMs docker daemon
image := "busybox"
rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "pull", image))
medyagh marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err)
}
// Restart minikube
rr, err = Run(t, exec.CommandContext(ctx, Target(), startArgs...))
if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err)
}
// Ensure that busybox still exists in the daemon
rr, err = Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "--", "docker", "images"))
if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err)
}
if !strings.Contains(rr.Output(), image) {
t.Fatalf("Expected to find %s in output of `docker images`, instead got %s", image, rr.Output())
}
}

// testPodScheduling asserts that this configuration can schedule new pods
func testPodScheduling(ctx context.Context, t *testing.T, profile string) {
t.Helper()
Expand Down