aboutsummaryrefslogtreecommitdiff
path: root/test/utils
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2022-07-19 05:37:47 -0600
committerEd Santiago <santiago@redhat.com>2022-07-21 20:08:32 -0600
commit0a160fed77c753d1d5683ad40285bb41f1c895d5 (patch)
treebf99834b1786a2c0e3529cf6b8c245ab9782c0fc /test/utils
parentee937c518e7efb9c47d21a4e1050b966ca02d005 (diff)
downloadpodman-0a160fed77c753d1d5683ad40285bb41f1c895d5.tar.gz
podman-0a160fed77c753d1d5683ad40285bb41f1c895d5.tar.bz2
podman-0a160fed77c753d1d5683ad40285bb41f1c895d5.zip
Bump VMs, to Ubuntu 2204 with cgroups v1
...and enable the at-test-time confirmation, the one that double-checks that if CI requests runc we actually use runc. This exposed a nasty surprise in our setup: there are steps to define $OCI_RUNTIME, but that's actually a total fakeout! OCI_RUNTIME is used only in e2e tests, it has no effect whatsoever on actual podman itself as invoked via command line such as in system tests. Solution: use containers.conf Given how fragile all this runtime stuff is, I've also added new tests (e2e and system) that will check $CI_DESIRED_RUNTIME. Image source: https://github.com/containers/automation_images/pull/146 Since we haven't actually been testing with runc, we need to fix a few tests: - handle an error-message change (make it work in both crun and runc) - skip one system test, "survive service stop", that doesn't work with runc and I don't think we care. ...and skip a bunch, filing issues for each: - #15013 pod create --share-parent - #15014 timeout in dd - #15015 checkpoint tests time out under $CONTAINER - #15017 networking timeout with registry - #15018 restore --pod gripes about missing --pod - #15025 run --uidmap broken - #15027 pod inspect cgrouppath broken - ...and a bunch more ("podman pause") that probably don't even merit filing an issue. Also, use /dev/urandom in one test (was: /dev/random) because the test is timing out and /dev/urandom does not block. (But the test is still timing out anyway, even with this change) Also, as part of the VM switch we are now using go 1.18 (up from 1.17) and this broke the gitlab tests. Thanks to @Luap99 for a quick fix. Also, slight tweak to #15021: include the timeout value, and reword message so command string is at end. Also, fixed a misspelling in a test name. Fixes: #14833 Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/utils')
-rw-r--r--test/utils/utils.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go
index 924f66ec8..e84b57cc6 100644
--- a/test/utils/utils.go
+++ b/test/utils/utils.go
@@ -367,8 +367,8 @@ func (s *PodmanSession) WaitWithDefaultTimeout() {
func (s *PodmanSession) WaitWithTimeout(timeout int) {
Eventually(s, timeout).Should(Exit(), func() string {
// in case of timeouts show output
- return fmt.Sprintf("command %v timed out\nSTDOUT: %s\nSTDERR: %s",
- s.Command.Args, string(s.Out.Contents()), string(s.Err.Contents()))
+ return fmt.Sprintf("command timed out after %ds: %v\nSTDOUT: %s\nSTDERR: %s",
+ timeout, s.Command.Args, string(s.Out.Contents()), string(s.Err.Contents()))
})
os.Stdout.Sync()
os.Stderr.Sync()