test: fix issues with cherry-picking #13376 to 6.x #8103
| Job | Run time |
|---|---|
| 38s | |
| 0s | |
| 1m 36s | |
| 1m 21s | |
| 1m 33s | |
| 1m 28s | |
| 1m 16s | |
| 1m 30s | |
| 1m 26s | |
| 1m 19s | |
| 1m 50s | |
| 1m 29s | |
| 1m 20s | |
| 1m 33s | |
| 1m 33s | |
| 0s | |
| 19m 52s |
| Job | Run time |
|---|---|
| 38s | |
| 0s | |
| 1m 36s | |
| 1m 21s | |
| 1m 33s | |
| 1m 28s | |
| 1m 16s | |
| 1m 30s | |
| 1m 26s | |
| 1m 19s | |
| 1m 50s | |
| 1m 29s | |
| 1m 20s | |
| 1m 33s | |
| 1m 33s | |
| 0s | |
| 19m 52s |