fix ci

AlinsRan · AlinsRan · commit 40e7081babfd · 2025-12-01T13:42:44.000+08:00
diff --git a/.github/workflows/benchmark-test.yml b/.github/workflows/benchmark-test.yml
@@ -21,15 +21,9 @@ on:
   push:
     branches:
       - master
-<<<<<<< HEAD
   pull_request:
     branches:
       - master
-=======
-      - benchmark-test
-    tags:
-      - '*'
->>>>>>> benchmark-test
   workflow_dispatch:
     inputs:
       routes:
diff --git a/test/benchmark/benchmark_test.go b/test/benchmark/benchmark_test.go
@@ -305,7 +305,7 @@ spec:
 					sunccess++
 				}
 				return sunccess
-			}).WithTimeout(10 * time.Minute).ProbeEvery(500 * time.Millisecond).Should(Equal(totalConsumers))
+			}).WithTimeout(15 * time.Minute).ProbeEvery(1 * time.Second).Should(Equal(totalConsumers))
 			costTime := time.Since(now)
 			report.AddResult(TestResult{
 				Scenario:         "ApisixRoute With Consumers Benchmark",

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ spec:`
`305`	`305`	`sunccess++`
`306`	`306`	`}`
`307`	`307`	`return sunccess`
`308`		`- }).WithTimeout(10 * time.Minute).ProbeEvery(500 * time.Millisecond).Should(Equal(totalConsumers))`
	`308`	`+ }).WithTimeout(15 * time.Minute).ProbeEvery(1 * time.Second).Should(Equal(totalConsumers))`
`309`	`309`	`costTime := time.Since(now)`
`310`	`310`	`report.AddResult(TestResult{`
`311`	`311`	`Scenario: "ApisixRoute With Consumers Benchmark",`