Created
January 26, 2017 13:57
-
-
Save squeed/3800589e6738a6c4006f70a8cf26b7cf to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go | |
index d87530e..581b2c0 100644 | |
--- a/test/e2e_node/image_list.go | |
+++ b/test/e2e_node/image_list.go | |
@@ -60,6 +60,7 @@ func PrePullAllImages() error { | |
return err | |
} | |
images := framework.ImageWhiteList.List() | |
+ | |
glog.V(4).Infof("Pre-pulling images %+v", images) | |
for _, image := range images { | |
var ( | |
@@ -71,7 +72,7 @@ func PrePullAllImages() error { | |
time.Sleep(imagePullRetryDelay) | |
} | |
// TODO(random-liu): Use docker client to get rid of docker binary dependency. | |
- if output, err = exec.Command("docker", "pull", image).CombinedOutput(); err == nil { | |
+ if output, err = exec.Command("rkt", "--dir=/var/lib/rktlet/data", "image", "fetch", "--insecure-options=image", "docker://"+image).CombinedOutput(); err == nil { | |
break | |
} | |
glog.Warningf("Failed to pull %s as user %q, retrying in %s (%d of %d): %v", | |
diff --git a/test/e2e_node/system/validators.go b/test/e2e_node/system/validators.go | |
index 29143b3..935f8e0 100644 | |
--- a/test/e2e_node/system/validators.go | |
+++ b/test/e2e_node/system/validators.go | |
@@ -43,7 +43,7 @@ func Validate(spec SysSpec, report Reporter) error { | |
&OSValidator{Reporter: report}, | |
&KernelValidator{Reporter: report}, | |
&CgroupsValidator{Reporter: report}, | |
- &DockerValidator{Reporter: report}, | |
+ // &DockerValidator{Reporter: report}, | |
} | |
for _, v := range validators { | |
(END) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment