Skip to content

Commit e266c21

Browse files
authored
Merge pull request #612 from jingxu97/sep/agnhost
Update prepull image agnhost version
2 parents 254f925 + 86b6a68 commit e266c21

File tree

2 files changed

+11
-92
lines changed

2 files changed

+11
-92
lines changed

test/k8s-integration/main.go

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323
"strings"
2424
"syscall"
25+
"time"
2526

2627
"k8s.io/apimachinery/pkg/util/uuid"
2728
apimachineryversion "k8s.io/apimachinery/pkg/util/version"
@@ -333,6 +334,14 @@ func handle() error {
333334
if err != nil {
334335
return fmt.Errorf("failed to prepull images: %s, err: %v", out, err)
335336
}
337+
time.Sleep(10 * time.Minute)
338+
out, err = exec.Command("kubectl", "describe", "pods", "-n", driverNamespace).CombinedOutput()
339+
klog.Infof("describe pods \n %s", string(out))
340+
341+
if err != nil {
342+
return fmt.Errorf("failed to describe pods: %v", err)
343+
}
344+
336345
}
337346

338347
if !*useGKEManagedDriver {

test/k8s-integration/prepull.yaml

+2-92
Original file line numberDiff line numberDiff line change
@@ -33,99 +33,9 @@ spec:
3333
# run ping in each container to keep it alive so that kubernetes does not
3434
# continually restart the containers while we're prepulling.
3535
containers:
36-
- image: e2eteam/agnhost:2.20
36+
- image: k8s.gcr.io/e2e-test-images/agnhost:2.21
3737
name: agnhost-212
3838
resources:
3939
requests:
4040
cpu: 1m
41-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
42-
- image: e2eteam/busybox:1.29
43-
name: busybox1
44-
resources:
45-
requests:
46-
cpu: 1m
47-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
48-
- image: e2eteam/dnsutils:1.1
49-
name: dnsutils6
50-
resources:
51-
requests:
52-
cpu: 1m
53-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
54-
- image: e2eteam/echoserver:2.2
55-
name: echoserver7
56-
resources:
57-
requests:
58-
cpu: 1m
59-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
60-
- image: e2eteam/etcd:3.4.3
61-
name: etcd-343
62-
resources:
63-
requests:
64-
cpu: 1m
65-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
66-
- image: e2eteam/gb-frontend:v6
67-
name: gb-frontend12
68-
resources:
69-
requests:
70-
cpu: 1m
71-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
72-
- image: e2eteam/gb-redisslave:v3
73-
name: gb-redisslave-v3
74-
resources:
75-
requests:
76-
cpu: 1m
77-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
78-
- image: e2eteam/httpd:2.4.39-alpine
79-
name: httpd-2439
80-
resources:
81-
requests:
82-
cpu: 1m
83-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
84-
- image: e2eteam/jessie-dnsutils:1.0
85-
name: jessie-dnsutils17
86-
resources:
87-
requests:
88-
cpu: 1m
89-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
90-
- image: e2eteam/kitten:1.0
91-
name: kitten18
92-
resources:
93-
requests:
94-
cpu: 1m
95-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
96-
- image: e2eteam/mounttest:1.0
97-
name: mounttest21
98-
resources:
99-
requests:
100-
cpu: 1m
101-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
102-
- image: e2eteam/nautilus:1.0
103-
name: nautilus22
104-
resources:
105-
requests:
106-
cpu: 1m
107-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
108-
- image: e2eteam/nginx:1.14-alpine
109-
name: nginx26
110-
resources:
111-
requests:
112-
cpu: 1m
113-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
114-
- image: e2eteam/pause:3.1
115-
name: pause-31
116-
resources:
117-
requests:
118-
cpu: 1m
119-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
120-
- image: e2eteam/sample-apiserver:1.17
121-
name: sample-apiserver-117
122-
resources:
123-
requests:
124-
cpu: 1m
125-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
126-
- image: e2eteam/test-webserver:1.0
127-
name: test-webserver4
128-
resources:
129-
requests:
130-
cpu: 1m
131-
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
41+
command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']

0 commit comments

Comments
 (0)