christophd commented on code in PR #4330:
URL: https://github.com/apache/camel-k/pull/4330#discussion_r1186163659
##########
e2e/builder/build_test.go:
##########
@@ -57,76 +58,86 @@ func TestKitMaxBuildLimit(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- ns1 := NewTestNamespace(false).GetName()
- defer DumpNamespace(t, ns1)
- defer DeleteNamespace(t, ns1)
-
- pl1 := v1.NewIntegrationPlatform(ns1, fmt.Sprintf("camel-k-%s",
ns))
- pl.Spec.DeepCopyInto(&pl1.Spec)
- pl1.Spec.Build.Maven.Settings = v1.ValueSource{}
- pl1.SetOperatorID(fmt.Sprintf("camel-k-%s", ns))
- if err := TestClient().Create(TestContext, &pl1); err != nil {
- t.Error(err)
- t.FailNow()
- }
-
- Eventually(PlatformPhase(ns1),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- ns2 := NewTestNamespace(false).GetName()
- defer DumpNamespace(t, ns2)
- defer DeleteNamespace(t, ns2)
-
- pl2 := v1.NewIntegrationPlatform(ns2, fmt.Sprintf("camel-k-%s",
ns))
- pl.Spec.DeepCopyInto(&pl2.Spec)
- pl2.Spec.Build.Maven.Settings = v1.ValueSource{}
- pl2.SetOperatorID(fmt.Sprintf("camel-k-%s", ns))
- if err := TestClient().Create(TestContext, &pl2); err != nil {
- t.Error(err)
- t.FailNow()
- }
-
- Eventually(PlatformPhase(ns2),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
-
- doKitBuildInNamespace(buildA, ns, TestTimeoutShort, kitOptions{
- operatorID: fmt.Sprintf("camel-k-%s", ns),
- dependencies: []string{
- "camel:timer", "camel:log",
- },
- traits: []string{
- "builder.properties=build-property=A",
- },
- }, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
-
- doKitBuildInNamespace(buildB, ns1, TestTimeoutShort, kitOptions{
- operatorID: fmt.Sprintf("camel-k-%s", ns),
- dependencies: []string{
- "camel:timer", "camel:log",
- },
- traits: []string{
- "builder.properties=build-property=B",
- },
- }, v1.BuildPhaseRunning, v1.IntegrationKitPhaseBuildRunning)
-
- doKitBuildInNamespace(buildC, ns2, TestTimeoutShort, kitOptions{
- operatorID: fmt.Sprintf("camel-k-%s", ns),
- dependencies: []string{
- "camel:timer", "camel:log",
- },
- traits: []string{
- "builder.properties=build-property=C",
- },
- }, v1.BuildPhaseScheduling, v1.IntegrationKitPhaseNone)
-
- // verify that buildC is allowed to build as soon as buildA has
finished
- Eventually(BuildPhase(ns, buildA),
TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(BuildPhase(ns2, buildC),
TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning))
- Eventually(KitPhase(ns2, buildC),
TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseBuildRunning))
-
- // verify that all builds are successful
- Eventually(BuildPhase(ns1, buildB),
TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns1, buildB),
TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
- Eventually(BuildPhase(ns2, buildC),
TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded))
- Eventually(KitPhase(ns2, buildC),
TestTimeoutLong).Should(Equal(v1.IntegrationKitPhaseReady))
+ WithNewTestNamespace(t, func(ns1 string) {
+ WithNewTestNamespace(t, func(ns2 string) {
+ pl1 := v1.NewIntegrationPlatform(ns1,
fmt.Sprintf("camel-k-%s", ns))
+ pl.Spec.DeepCopyInto(&pl1.Spec)
+ pl1.Spec.Build.Maven.Settings = v1.ValueSource{}
+ pl1.SetOperatorID(fmt.Sprintf("camel-k-%s", ns))
+ if err := TestClient().Create(TestContext,
&pl1); err != nil {
+ t.Error(err)
+ t.FailNow()
+ }
+
+ Eventually(PlatformPhase(ns1),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ pl2 := v1.NewIntegrationPlatform(ns2,
fmt.Sprintf("camel-k-%s", ns))
+ pl.Spec.DeepCopyInto(&pl2.Spec)
+ pl2.Spec.Build.Maven.Settings = v1.ValueSource{}
+ pl2.SetOperatorID(fmt.Sprintf("camel-k-%s", ns))
+ if err := TestClient().Create(TestContext,
&pl2); err != nil {
+ t.Error(err)
+ t.FailNow()
+ }
+
+ Eventually(PlatformPhase(ns2),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+
+ doKitBuildInNamespace(buildA, ns,
TestTimeoutShort, kitOptions{
+ operatorID: fmt.Sprintf("camel-k-%s",
ns),
+ dependencies: []string{
+ "camel:timer", "camel:log",
+ },
+ traits: []string{
+
"builder.properties=build-property=A",
+ },
+ }, v1.BuildPhaseRunning,
v1.IntegrationKitPhaseBuildRunning)
+
+ doKitBuildInNamespace(buildB, ns1,
TestTimeoutShort, kitOptions{
+ operatorID: fmt.Sprintf("camel-k-%s",
ns),
+ dependencies: []string{
+ "camel:timer", "camel:log",
+ },
+ traits: []string{
+
"builder.properties=build-property=B",
+ },
+ }, v1.BuildPhaseRunning,
v1.IntegrationKitPhaseBuildRunning)
+
+ doKitBuildInNamespace(buildC, ns2,
TestTimeoutShort, kitOptions{
+ operatorID: fmt.Sprintf("camel-k-%s",
ns),
+ dependencies: []string{
+ "camel:timer", "camel:log",
+ },
+ traits: []string{
+
"builder.properties=build-property=C",
+ },
+ }, v1.BuildPhaseScheduling,
v1.IntegrationKitPhaseNone)
+
+ var notExceedsMaxBuildLimit =
func(runningBuilds int) bool {
+ return runningBuilds <= 2
+ }
+
+ limit := 0
+ for limit < 5 && BuildPhase(ns, buildA)() ==
v1.BuildPhaseRunning {
Review Comment:
Looping indefinitely on all build phases is dangerous as we have already had
the situation where builds keep stuck in Running phase forever. This would mean
that the test never ends and we have a hanging build. So at some point you
always need to break the loop.
I'd prefer to have a defined end of the test and to make sure that the max
build limit checks has been constantly verified as long as the 1st scheduled
build is in running phase.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
