[camel-k] 02/03: workaround: force eclipse-temurin:11 as runtime base image for upgrade tests

[pcongiusti]

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

commit 84e6458967a2a22397d946fb89786ba407f21eb5
Author: Luca Burgazzoli <lburgazz...@gmail.com>
AuthorDate: Mon Jan 23 20:40:47 2023 +0100

    workaround: force eclipse-temurin:11 as runtime base image for upgrade tests
---
 e2e/namespace/upgrade/cli_upgrade_test.go | 4 ++--
 e2e/namespace/upgrade/olm_upgrade_test.go | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/e2e/namespace/upgrade/cli_upgrade_test.go 
b/e2e/namespace/upgrade/cli_upgrade_test.go
index 7e9b35d23..e3f155c87 100644
--- a/e2e/namespace/upgrade/cli_upgrade_test.go
+++ b/e2e/namespace/upgrade/cli_upgrade_test.go
@@ -51,7 +51,7 @@ 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").Execute()).To(Succeed())
+               Expect(Kamel("install", "-n", ns, "--olm=false", "--force", 
"--base-image", defaults.BaseImage()).Execute()).To(Succeed())
 
                // Check the operator pod is running
                Eventually(OperatorPodPhase(ns), 
TestTimeoutMedium).Should(Equal(corev1.PodRunning))
@@ -75,7 +75,7 @@ func TestOperatorUpgrade(t *testing.T) {
                Expect(os.Setenv("KAMEL_BIN", "")).To(Succeed())
 
                // Upgrade the operator by installing the current version
-               Expect(KamelInstall(ns, "--olm=false", "--force", 
"--operator-image", image).Execute()).To(Succeed())
+               Expect(KamelInstall(ns, "--olm=false", "--force", 
"--operator-image", image, "--base-image", 
defaults.BaseImage()).Execute()).To(Succeed())
 
                // Check the operator image is the current built one
                Eventually(OperatorImage(ns)).Should(Equal(image))
diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go 
b/e2e/namespace/upgrade/olm_upgrade_test.go
index 1a27c7c60..92fcc8e52 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -71,7 +71,14 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
                // Set KAMEL_BIN only for this test - don't override the ENV 
variable for all tests
                Expect(os.Setenv("KAMEL_BIN", kamel)).To(Succeed())
 
-               args := []string{"install", "-n", ns, "--olm=true", 
"--olm-source", catalogSourceName, "--olm-source-namespace", ns}
+               args := []string{
+                       "install",
+                       "-n", ns,
+                       "--olm=true",
+                       "--olm-source", catalogSourceName,
+                       "--olm-source-namespace", ns,
+                       "--base-image", defaults.BaseImage(),
+               }
 
                if prevUpdateChannel != "" {
                        args = append(args, "--olm-channel", prevUpdateChannel)