diff options
| -rw-r--r-- | .cirrus.yml | 11 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 11 | ||||
| -rw-r--r-- | utils/utils_supported.go | 4 |
3 files changed, 9 insertions, 17 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1eb516d84..a403889c6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,17 +30,20 @@ env: PRIOR_UBUNTU_NAME: "ubuntu-2010" # Google-cloud VM Images + # TODO: At the time of this comment, an selinux-policy regression is blocking use of updated + # Fedora VM images: https://bugzilla.redhat.com/show_bug.cgi?id=1965743 + IMAGE_SUFFIX_UBUNTU: "c5521575421149184" IMAGE_SUFFIX: "c5348179051806720" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" - UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${IMAGE_SUFFIX}" + UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX_UBUNTU}" + PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${IMAGE_SUFFIX_UBUNTU}" # Container FQIN's FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}" - UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CONTAINER_FQIN: "quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX}" + UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX_UBUNTU}" + PRIOR_UBUNTU_CONTAINER_FQIN: "quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX_UBUNTU}" #### #### Control variables that determine what to run and how to run it. diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index cae1b5aad..e71e7a248 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -933,17 +933,6 @@ USER mail`, BB) Expect(session.OutputToString()).To(ContainSubstring("mail root")) }) - It("podman run with incorect VOLUME", func() { - dockerfile := fmt.Sprintf(`FROM %s -VOLUME ['/etc/foo'] -WORKDIR /etc/foo`, BB) - podmanTest.BuildImage(dockerfile, "test", "false") - session := podmanTest.Podman([]string{"run", "--rm", "test", "echo", "test"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("test")) - }) - It("podman run --volumes-from flag", func() { vol := filepath.Join(podmanTest.TempDir, "vol-test") err := os.MkdirAll(vol, 0755) diff --git a/utils/utils_supported.go b/utils/utils_supported.go index ad6192255..8668e3fba 100644 --- a/utils/utils_supported.go +++ b/utils/utils_supported.go @@ -172,7 +172,7 @@ func moveUnderCgroup(cgroup, subtree string, processes []uint32) error { if len(processes) > 0 { for _, pid := range processes { if _, err := f.Write([]byte(fmt.Sprintf("%d\n", pid))); err != nil { - logrus.Warnf("Cannot move process %d to cgroup %q", pid, newCgroup) + logrus.Debugf("Cannot move process %d to cgroup %q: %v", pid, newCgroup, err) } } } else { @@ -185,7 +185,7 @@ func moveUnderCgroup(cgroup, subtree string, processes []uint32) error { continue } if _, err := f.Write(pid); err != nil { - logrus.Warnf("Cannot move process %s to cgroup %q", string(pid), newCgroup) + logrus.Debugf("Cannot move process %s to cgroup %q: %v", string(pid), newCgroup, err) } } } |