github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24634 from yujuhong/privileged_tests

Browse Source 
Automatic merge from submit-queue

node_e2e: disable serialized image pulls and increase test timeout

This addresses #24605
This commit is contained in:
k8s-merge-robot 2016-04-21 20:22:57 -07:00
commit 087776dc14
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e_node/e2e_service.go
View File

@ -145,6 +145,7 @@ func (es *e2eService) startKubeletServer() (*exec.Cmd, error) {
"--hostname-override", es.nodeName, // Required because hostname is inconsistent across hosts
"--volume-stats-agg-period", "10s", // Aggregate volumes frequently so tests don't need to wait as long
"--allow-privileged", "true",
"--serialize-image-pulls", "false",
)
hcc := newHealthCheckCommand(
"http://127.0.0.1:10255/healthz",

2
test/e2e_node/privileged_test.go
View File

@ -184,7 +184,7 @@ func newHostExecPodSpec(ns, name string) *api.Pod {
func waitForPodRunning(c *client.Client, ns string, name string) error {
var pod *api.Pod
var err error
for t := time.Now(); time.Since(t) < time.Minute; time.Sleep(time.Second * 5) {
for t := time.Now(); time.Since(t) < time.Minute*2; time.Sleep(time.Second * 5) {
pod, err = c.Pods(ns).Get(name)
Expect(err).NotTo(HaveOccurred())
if pod == nil {