summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2021-08-11 14:38:02 -0400
committerMatthew Heon <matthew.heon@pm.me>2021-08-11 15:28:18 -0400
commit7442f0b858e5fe2d7922b3b5714030fda5b2646e (patch)
treed54633e92f854dfe9f5e0e0361e46e35c2dcfe7d /test/e2e
parent61a5e981276cca57d604108d19bcfa1beae2f271 (diff)
downloadpodman-7442f0b858e5fe2d7922b3b5714030fda5b2646e.tar.gz
podman-7442f0b858e5fe2d7922b3b5714030fda5b2646e.tar.bz2
podman-7442f0b858e5fe2d7922b3b5714030fda5b2646e.zip
Revert "Podman Pod Create --cpus and --cpuset-cpus flags"
This reverts commit bbd085ad1e3cf9c5b543c907ad7014ccf8a5cb34. The cgroup work to enable these has not happened yet and will not be ready in time for the release of Podman 3.3.0. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/pod_create_test.go45
1 files changed, 0 insertions, 45 deletions
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index 4c6788b9d..028689211 100644
--- a/test/e2e/pod_create_test.go
+++ b/test/e2e/pod_create_test.go
@@ -5,12 +5,9 @@ import (
"io/ioutil"
"os"
"path/filepath"
- "strconv"
"strings"
- "github.com/containers/common/pkg/sysinfo"
"github.com/containers/podman/v3/pkg/rootless"
- "github.com/containers/podman/v3/pkg/util"
. "github.com/containers/podman/v3/test/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -519,48 +516,6 @@ ENTRYPOINT ["sleep","99999"]
Expect(create).Should(Exit(0))
})
- It("podman pod create --cpus", func() {
- podName := "testPod"
- numCPU := float64(sysinfo.NumCPU())
- period, quota := util.CoresToPeriodAndQuota(numCPU)
- numCPUStr := strconv.Itoa(int(numCPU))
- podCreate := podmanTest.Podman([]string{"pod", "create", "--cpus", numCPUStr, "--name", podName})
- podCreate.WaitWithDefaultTimeout()
- Expect(podCreate).Should(Exit(0))
-
- contCreate := podmanTest.Podman([]string{"container", "create", "--pod", podName, "alpine"})
- contCreate.WaitWithDefaultTimeout()
- Expect(podCreate).Should(Exit(0))
-
- podInspect := podmanTest.Podman([]string{"pod", "inspect", podName})
- podInspect.WaitWithDefaultTimeout()
- Expect(podInspect).Should(Exit(0))
- podJSON := podInspect.InspectPodToJSON()
- Expect(podJSON.CPUPeriod).To(Equal(period))
- Expect(podJSON.CPUQuota).To(Equal(quota))
- })
-
- It("podman pod create --cpuset-cpus", func() {
- podName := "testPod"
- ctrName := "testCtr"
- numCPU := float64(sysinfo.NumCPU())
- numCPUStr := strconv.Itoa(int(numCPU))
- in := "0-" + numCPUStr
- podCreate := podmanTest.Podman([]string{"pod", "create", "--cpuset-cpus", in, "--name", podName})
- podCreate.WaitWithDefaultTimeout()
- Expect(podCreate).Should(Exit(0))
-
- contCreate := podmanTest.Podman([]string{"container", "create", "--name", ctrName, "--pod", podName, "alpine"})
- contCreate.WaitWithDefaultTimeout()
- Expect(podCreate).Should(Exit(0))
-
- podInspect := podmanTest.Podman([]string{"pod", "inspect", podName})
- podInspect.WaitWithDefaultTimeout()
- Expect(podInspect).Should(Exit(0))
- podJSON := podInspect.InspectPodToJSON()
- Expect(podJSON.CPUSetCPUs).To(Equal(in))
- })
-
It("podman pod create --pid", func() {
podName := "pidPod"
ns := "ns:/proc/self/ns/"