You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/05/16 08:02:10 UTC
[camel-k] 06/07: chore(e2e): let default memory for builder test
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
commit d52a50f390e560825a9aae5fe656459d6db7849c
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu May 11 09:58:16 2023 +0200
chore(e2e): let default memory for builder test
---
e2e/builder/build_test.go | 23 ++++++-----------------
pkg/trait/quarkus.go | 4 ++--
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 4fb00e041..bc965aa36 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -25,7 +25,6 @@ package builder
import (
"errors"
"fmt"
- "os"
"testing"
"time"
@@ -33,7 +32,6 @@ import (
. "github.com/apache/camel-k/v2/e2e/support"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/util/openshift"
)
type kitOptions struct {
@@ -142,7 +140,7 @@ func TestKitMaxBuildLimit(t *testing.T) {
}
func TestKitTimerToLogFullBuild(t *testing.T) {
- doKitFullBuild(t, "timer-to-log", "500Mi", "8m0s", TestTimeoutLong, kitOptions{
+ doKitFullBuild(t, "timer-to-log", "8m0s", TestTimeoutLong, kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
},
@@ -150,7 +148,7 @@ func TestKitTimerToLogFullBuild(t *testing.T) {
}
func TestKitKnativeFullBuild(t *testing.T) {
- doKitFullBuild(t, "knative", "500Mi", "8m0s", TestTimeoutLong, kitOptions{
+ doKitFullBuild(t, "knative", "8m0s", TestTimeoutLong, kitOptions{
dependencies: []string{
"camel-quarkus-knative",
},
@@ -158,7 +156,7 @@ func TestKitKnativeFullBuild(t *testing.T) {
}
func TestKitTimerToLogFullNativeBuild(t *testing.T) {
- doKitFullBuild(t, "timer-to-log", "4Gi", "15m0s", TestTimeoutLong*3, kitOptions{
+ doKitFullBuild(t, "timer-to-log", "15m0s", TestTimeoutLong*3, kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
},
@@ -168,27 +166,18 @@ func TestKitTimerToLogFullNativeBuild(t *testing.T) {
}, v1.BuildPhaseSucceeded, v1.IntegrationKitPhaseReady)
}
-func doKitFullBuild(t *testing.T, name string, memoryLimit string, buildTimeout string, testTimeout time.Duration,
+func doKitFullBuild(t *testing.T, name string, buildTimeout string, testTimeout time.Duration,
options kitOptions, buildPhase v1.BuildPhase, kitPhase v1.IntegrationKitPhase) {
t.Helper()
WithNewTestNamespace(t, func(ns string) {
- createOperator(ns, memoryLimit, buildTimeout)
+ createOperator(ns, buildTimeout)
doKitBuildInNamespace(name, ns, testTimeout, options, buildPhase, kitPhase)
})
}
-func createOperator(ns string, memoryLimit string, buildTimeout string, installArgs ...string) {
- strategy := os.Getenv("KAMEL_INSTALL_BUILD_PUBLISH_STRATEGY")
- ocp, err := openshift.IsOpenShift(TestClient())
- Expect(err).To(Succeed())
-
+func createOperator(ns string, buildTimeout string, installArgs ...string) {
args := []string{"--build-timeout", buildTimeout}
- // TODO: configure build Pod resources if applicable
- if strategy == "Spectrum" || ocp {
- args = append(args, "--operator-resources", "limits.memory="+memoryLimit)
- }
-
args = append(args, installArgs...)
operatorID := fmt.Sprintf("camel-k-%s", ns)
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index 58b1ca33e..0dfecb6c4 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -149,10 +149,10 @@ func (t *quarkusTrait) Configure(e *Environment) (bool, error) {
func (t *quarkusTrait) Apply(e *Environment) error {
if t.hasKitNativeType() {
// Force the build to run in a separate Pod
- t.L.Info("This is a Quarkus native build: setting build configuration with build Pod strategy, 1 CPU core and 8 GiB memory. Make sure your cluster can handle it.")
+ t.L.Info("This is a Quarkus native build: setting build configuration with build Pod strategy, 1 CPU core and 4 GiB memory. Make sure your cluster can handle it.")
e.BuildConfiguration.Strategy = v1.BuildStrategyPod
e.BuildConfiguration.RequestCPU = "1000m"
- e.BuildConfiguration.RequestMemory = "8Gi"
+ e.BuildConfiguration.RequestMemory = "4Gi"
}
if e.IntegrationInPhase(v1.IntegrationPhaseBuildingKit) {