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/06/06 07:13:47 UTC
[camel-k] 01/03: fix(ci): temporarily repair upgrade checks
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e5f4cc60fcdbe42d5b06cbb7a74daaa00901bd7b
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Jun 1 17:05:06 2023 +0200
fix(ci): temporarily repair upgrade checks
Ref #4312
---
e2e/namespace/upgrade/cli_upgrade_test.go | 13 ++++++++++++-
e2e/namespace/upgrade/olm_upgrade_test.go | 3 +++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/e2e/namespace/upgrade/cli_upgrade_test.go b/e2e/namespace/upgrade/cli_upgrade_test.go
index e3f155c87..19f61b5eb 100644
--- a/e2e/namespace/upgrade/cli_upgrade_test.go
+++ b/e2e/namespace/upgrade/cli_upgrade_test.go
@@ -51,7 +51,18 @@ func TestOperatorUpgrade(t *testing.T) {
Expect(os.Setenv("KAMEL_BIN", kamel)).To(Succeed())
// Should both install the CRDs and kamel in the given namespace
- Expect(Kamel("install", "-n", ns, "--olm=false", "--force", "--base-image", defaults.BaseImage()).Execute()).To(Succeed())
+ Expect(Kamel(
+ "install",
+ "-n",
+ ns,
+ "--olm=false",
+ "--force",
+ "--base-image",
+ defaults.BaseImage(),
+ // TODO: remove GOMAXPROCS when https://github.com/apache/camel-k/issues/4312 is closed
+ "--operator-env-vars",
+ "GOMAXPROCS=1",
+ ).Execute()).To(Succeed())
// Check the operator pod is running
Eventually(OperatorPodPhase(ns), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go b/e2e/namespace/upgrade/olm_upgrade_test.go
index 7325df3e4..1a74dc131 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -91,6 +91,9 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
"--olm-source", catalogSourceName,
"--olm-source-namespace", ns,
"--base-image", defaults.BaseImage(),
+ // TODO: remove GOMAXPROCS when https://github.com/apache/camel-k/issues/4312 is closed
+ "--operator-env-vars",
+ "GOMAXPROCS=1",
}
if prevUpdateChannel != "" {