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 ac77343e1 fix(ci): temporarily repair upgrade checks
ac77343e1 is described below
commit ac77343e13b42a6aa37da21ae870f93da7e56ede
Author: Pasquale Congiusti <pasquale.congiu...@gmail.com>
AuthorDate: Thu Jun 1 17:05:06 2023 +0200
fix(ci): temporarily repair upgrade checks
Ref #4312
---
.github/workflows/install.yml | 2 +-
e2e/install/olm/olm_upgrade_test.go | 3 +++
e2e/install/olm/upgrade_test.go | 13 ++++++++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 600c32368..1cc259020 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -87,7 +87,7 @@ jobs:
-q "${{ github.event.inputs.log-level }}" \
-t "${{ github.event.inputs.test-filters }}"
- - name: Install and upgrade test (OLM)
+ - name: Install (Non OLM)
uses: ./.github/actions/e2e-install
with:
cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
diff --git a/e2e/install/olm/olm_upgrade_test.go
b/e2e/install/olm/olm_upgrade_test.go
index edbf71158..8b0a4fe5d 100644
--- a/e2e/install/olm/olm_upgrade_test.go
+++ b/e2e/install/olm/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 != "" {
diff --git a/e2e/install/olm/upgrade_test.go b/e2e/install/olm/upgrade_test.go
index 65c0acf55..3e73b377e 100644
--- a/e2e/install/olm/upgrade_test.go
+++ b/e2e/install/olm/upgrade_test.go
@@ -52,7 +52,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))
