@@ -40,6 +40,11 @@ type simplifiedCrioInfo struct {
40
40
CgroupDriver string `json:"cgroup_driver"`
41
41
}
42
42
43
+ // overrideCrioOperationTimeoutSeconds replaces the currently *extremely* low
44
+ // default crio operation timeouts that cause flakes in our CI.
45
+ // See https://github.com/openshift/os/issues/818
46
+ const overrideCrioOperationTimeoutSeconds = "300s"
47
+
43
48
// crioPodTemplate is a simple string template required for creating a pod in crio
44
49
// It takes two strings: the name (which will be expanded) and the generated image name
45
50
var crioPodTemplate = `{
@@ -283,12 +288,13 @@ func crioNetwork(c cluster.TestCluster) {
283
288
}
284
289
285
290
listener := func (ctx context.Context ) error {
286
- podID , err := c .SSHf (dest , "sudo crictl runp %s" , crioConfigPod )
291
+ podID , err := c .SSHf (dest , "sudo crictl runp -T %s %s" , overrideCrioOperationTimeoutSeconds , crioConfigPod )
287
292
if err != nil {
288
293
return err
289
294
}
290
295
291
- containerID , err := c .SSHf (dest , "sudo crictl create --no-pull %s %s %s" ,
296
+ containerID , err := c .SSHf (dest , "sudo crictl create -T %s --no-pull %s %s %s" ,
297
+ overrideCrioOperationTimeoutSeconds ,
292
298
podID , crioConfigContainer , crioConfigPod )
293
299
if err != nil {
294
300
return err
@@ -326,12 +332,13 @@ func crioNetwork(c cluster.TestCluster) {
326
332
time .Sleep (100 * time .Millisecond )
327
333
}
328
334
}
329
- podID , err := c .SSHf (src , "sudo crictl runp %s" , crioConfigPod )
335
+ podID , err := c .SSHf (src , "sudo crictl runp -T %s %s" , overrideCrioOperationTimeoutSeconds , crioConfigPod )
330
336
if err != nil {
331
337
return err
332
338
}
333
339
334
- containerID , err := c .SSHf (src , "sudo crictl create --no-pull %s %s %s" ,
340
+ containerID , err := c .SSHf (src , "sudo crictl create -T %s --no-pull %s %s %s" ,
341
+ overrideCrioOperationTimeoutSeconds ,
335
342
podID , crioConfigContainer , crioConfigPod )
336
343
if err != nil {
337
344
return err
@@ -379,9 +386,10 @@ func crioNetworksReliably(c cluster.TestCluster) {
379
386
c .Fatal (err )
380
387
}
381
388
382
- cmdCreatePod := fmt .Sprintf ("sudo crictl runp %s" , crioConfigPod )
389
+ cmdCreatePod := fmt .Sprintf ("sudo crictl runp -T %s %s" , overrideCrioOperationTimeoutSeconds , crioConfigPod )
383
390
podID := c .MustSSH (m , cmdCreatePod )
384
- containerID := c .MustSSH (m , fmt .Sprintf ("sudo crictl create --no-pull %s %s %s" ,
391
+ containerID := c .MustSSH (m , fmt .Sprintf ("sudo crictl create -T %s --no-pull %s %s %s" ,
392
+ overrideCrioOperationTimeoutSeconds ,
385
393
podID , crioConfigContainer , crioConfigPod ))
386
394
output = output + string (c .MustSSH (m , fmt .Sprintf ("sudo crictl exec %s ping -i 0.2 %s -w 1 >/dev/null && echo PASS || echo FAIL" , containerID , hostIP )))
387
395
}
@@ -441,9 +449,10 @@ func crioPodContinuesDuringServiceRestart(c cluster.TestCluster) {
441
449
if err != nil {
442
450
c .Fatal (err )
443
451
}
444
- cmdCreatePod := fmt .Sprintf ("sudo crictl runp %s" , crioConfigPod )
452
+ cmdCreatePod := fmt .Sprintf ("sudo crictl runp -T %s %s" , overrideCrioOperationTimeoutSeconds , crioConfigPod )
445
453
podID := c .MustSSH (m , cmdCreatePod )
446
- containerID := c .MustSSH (m , fmt .Sprintf ("sudo crictl create --no-pull %s %s %s" ,
454
+ containerID := c .MustSSH (m , fmt .Sprintf ("sudo crictl create -T %s --no-pull %s %s %s" ,
455
+ overrideCrioOperationTimeoutSeconds ,
447
456
podID , crioConfigContainer , crioConfigPod ))
448
457
449
458
cmd := fmt .Sprintf ("sudo crictl exec %s bash -c \" sleep 25 && echo PASS > /tmp/test/restart-test\" " , containerID )
0 commit comments