summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extras/hs-test/infra/cpu.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/extras/hs-test/infra/cpu.go b/extras/hs-test/infra/cpu.go
index b26a06c98db..6ba60e5dfe4 100644
--- a/extras/hs-test/infra/cpu.go
+++ b/extras/hs-test/infra/cpu.go
@@ -39,6 +39,13 @@ func (c *CpuAllocatorT) Allocate(containerCount int, nCpus int) (*CpuContext, er
// indexes, not actual cores
var minCpu, maxCpu int
+ // temporary fix for CpuPinningSuite
+ if strings.Contains(CurrentSpecReport().ContainerHierarchyTexts[0], "CpuPinning") {
+ cpuAllocator.maxContainerCount = 1
+ } else {
+ cpuAllocator.maxContainerCount = 4
+ }
+
if c.runningInCi {
minCpu = ((c.buildNumber) * c.maxContainerCount * nCpus)
maxCpu = ((c.buildNumber + 1) * c.maxContainerCount * nCpus) - 1
@@ -130,7 +137,7 @@ func (c *CpuAllocatorT) readCpus() error {
tmpCpus = iterateAndAppend(third, fourth, tmpCpus)
// discard cpu 0
- if tmpCpus[0] == 0 && !*UseCpu0{
+ if tmpCpus[0] == 0 && !*UseCpu0 {
tmpCpus = tmpCpus[1:]
}