Skip to content

Commit 40bdac1

Browse files
committed
Update
1 parent e60fe08 commit 40bdac1

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

tests/ginkgo/fixture/fixture.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,17 @@ var NamespaceLabels = map[string]string{E2ETestLabelsKey: E2ETestLabelsValue}
5050
// - When the availabel disk space drops to 4GiB, the K8s instance will start to arbitrarily evict pods, which causes tests to intermittently fail.
5151
// - As a workaround (since we can't increase the GH action env), each parallel test will wait for a minimum of disk space before starting.
5252
// - Before each parallel test, we thus run `df` command and wait for it to tell use that >= 5GB of disk space is available.
53-
func waitForRootPartitionToHaveMinimumDiskSpace() {
53+
func WaitForRootPartitionToHaveMinimumDiskSpace() {
5454

55-
GinkgoWriter.Println("waitForRootPartitionToHaveMinimumDiskSpace")
55+
By("WTF")
56+
57+
fmt.Println("waitForRootPartitionToHaveMinimumDiskSpace")
5658

5759
for {
5860

5961
output, err := osFixture.ExecCommandWithOutputParam(true, "df")
6062
Expect(err).ToNot(HaveOccurred())
61-
GinkgoWriter.Println("JGW------------------")
63+
fmt.Println("JGW------------------")
6264
var rootEntry string
6365
for line := range strings.SplitSeq(output, "\n") {
6466
GinkgoWriter.Println("-", line)
@@ -68,7 +70,7 @@ func waitForRootPartitionToHaveMinimumDiskSpace() {
6870
}
6971
}
7072
if rootEntry == "" {
71-
GinkgoWriter.Println("No /dev/root volume to manage")
73+
fmt.Println("No /dev/root volume to manage")
7274
return
7375
}
7476

@@ -85,7 +87,7 @@ func waitForRootPartitionToHaveMinimumDiskSpace() {
8587

8688
// If less than 6 GB available, sleep and continue the loop
8789
if availableGB < 6 {
88-
GinkgoWriter.Println("Waiting for /dev/root volume to have minimum size, current size:", availableGB, "GB")
90+
fmt.Println("Waiting for /dev/root volume to have minimum size, current size:", availableGB, "GB")
8991
time.Sleep(time.Second * 10)
9092
} else {
9193
return
@@ -102,7 +104,7 @@ func EnsureParallelCleanSlate() {
102104
SetDefaultConsistentlyDuration(time.Second * 10)
103105
SetDefaultConsistentlyPollingInterval(time.Second * 1)
104106

105-
waitForRootPartitionToHaveMinimumDiskSpace()
107+
// waitForRootPartitionToHaveMinimumDiskSpace()
106108

107109
// Unlike sequential clean slate, parallel clean slate cannot assume that there are no other tests running. This limits our ability to clean up old test artifacts.
108110
}
@@ -118,6 +120,8 @@ func EnsureSequentialCleanSlate() {
118120

119121
func EnsureSequentialCleanSlateWithError() error {
120122

123+
WaitForRootPartitionToHaveMinimumDiskSpace()
124+
121125
// With sequential tests, we are always safe to assume that there is no other test running. That allows us to clean up old test artifacts before new test starts.
122126

123127
// Increase the maximum length of debug output, for when tests fail

0 commit comments

Comments
 (0)