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/02 10:33:44 UTC
[camel-k] branch release-1.10.x updated: 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.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.10.x by this push:
new 258b40892 fix(ci): temporarily repair upgrade checks
258b40892 is described below
commit 258b408920b9c625b2b22863aaec6b589ed7209e
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 c86a7ddb9..021376969 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -79,6 +79,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 != "" {