This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 11c3fd296 fix(e2e): Improve max build limit E2E test
11c3fd296 is described below
commit 11c3fd2966b66c569cd7c81126a6d174b2d0970f
Author: Christoph Deppisch <[email protected]>
AuthorDate: Wed May 3 12:05:48 2023 +0200
fix(e2e): Improve max build limit E2E test
- Wait for IntegrationPlatforms in user namespaces to become ready before
starting new builds
- Avoids racing conditions on build and integration platform reconciliation
loops
- Avoids 1st build to succeed before 3rd build has been scheduled (skips
the max build limit)
---
e2e/builder/build_test.go | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 0ce00e9ca..0058e93d6 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -57,16 +57,6 @@ func TestKitMaxBuildLimit(t *testing.T) {
buildB := "integration-b"
buildC := "integration-c"
- 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)
-
ns1 := NewTestNamespace(false).GetName()
defer DumpNamespace(t, ns1)
defer DeleteNamespace(t, ns1)
@@ -80,15 +70,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
t.FailNow()
}
- 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)
+ Eventually(PlatformPhase(ns1),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
ns2 := NewTestNamespace(false).GetName()
defer DumpNamespace(t, ns2)
@@ -103,6 +85,28 @@ func TestKitMaxBuildLimit(t *testing.T) {
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{
