You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2022/09/01 11:41:40 UTC
[camel-k] branch main updated (551d0f83a -> e1cab69d4)
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 551d0f83a chore(deps): bump github.com/onsi/gomega from 1.20.1 to 1.20.2
new b82bc7738 feat(e2e): add CAMEL_K_TEST_NS env var to specify namespace to run tests
new 8ddb2a362 fix(e2e): native build requires more memory for Camel Quarkus 2.11
new 429f133a0 chore(e2e): native test - add warm up before native build testing
new e1cab69d4 chore(ci): split install-it workflow into two jobs: install, native
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{e2e-install => e2e-install-native}/action.yml | 6 +--
.../exec-tests.sh | 7 ++--
.github/actions/e2e-install/exec-tests.sh | 14 ++-----
.github/actions/e2e-knative/exec-tests.sh | 3 +-
.github/workflows/install.yml | 24 +++++++++++-
e2e/namespace/native/native_test.go | 43 +++++++++++++++++-----
e2e/support/test_support.go | 22 +++++++++--
7 files changed, 88 insertions(+), 31 deletions(-)
copy .github/actions/{e2e-install => e2e-install-native}/action.yml (97%)
copy .github/actions/{e2e-knative-yaks => e2e-install-native}/exec-tests.sh (94%)
[camel-k] 04/04: chore(ci): split install-it workflow into two jobs: install, native
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e1cab69d49bfdabbc13091c891fefcd922d43b71
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Thu Sep 1 16:35:59 2022 +0900
chore(ci): split install-it workflow into two jobs: install, native
---
.github/actions/e2e-install-native/action.yml | 117 +++++++++++++++++++++
.../exec-tests.sh | 16 +--
.github/actions/e2e-install/exec-tests.sh | 14 +--
.github/actions/e2e-knative/exec-tests.sh | 3 +-
.github/workflows/install.yml | 24 ++++-
5 files changed, 150 insertions(+), 24 deletions(-)
diff --git a/.github/actions/e2e-install-native/action.yml b/.github/actions/e2e-install-native/action.yml
new file mode 100644
index 000000000..1061ff8e5
--- /dev/null
+++ b/.github/actions/e2e-install-native/action.yml
@@ -0,0 +1,117 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
+
+name: e2e-install-native
+description: 'End-to-End tests for install use-cases (namespaced rather than global operator so no global operator install) with native builds'
+
+inputs:
+ cluster-config-data:
+ description: 'The configuration of the underlying cluster (if cluster-type is custom)'
+ required: false
+ cluster-kube-config-data:
+ description: 'Base16 encoded kube config - required for custom cluster type only'
+ required: false
+
+runs:
+ using: "composite"
+
+ steps:
+ - id: prepare-env
+ name: Prepare Test Environment
+ uses: ./.github/actions/kamel-prepare-env
+
+ - id: config-cluster
+ name: Configure Platform
+ uses: ./.github/actions/kamel-config-cluster
+ with:
+ cluster-type: ${{ env.TEST_CLUSTER }}
+ cluster-config-data: ${{ inputs.cluster-config-data }}
+ cluster-kube-config-data: ${{ inputs.cluster-kube-config-data }}
+
+ #
+ # Try and ensure the cluster is in a vanilla state before
+ # starting in on an installation
+ #
+ - id: pre-clean-cluster
+ name: Pre Clean Cluster
+ uses: ./.github/actions/kamel-cleanup
+ if: ${{ always() }}
+ with:
+ catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }}
+ catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }}
+ image-namespace: ${{ steps.config-cluster.outputs.cluster-image-namespace }}
+ global-operator-namespace: ${{ steps.config-cluster.outputs.cluster-global-operator-namespace }}
+
+ - id: build-kamel
+ name: Build Kamel
+ uses: ./.github/actions/kamel-build
+ with:
+ image-registry-push-host: ${{ steps.config-cluster.outputs.cluster-image-registry-push-host }}
+ image-registry-pull-host: ${{ steps.config-cluster.outputs.cluster-image-registry-pull-host }}
+ image-namespace: ${{ steps.config-cluster.outputs.cluster-image-namespace }}
+ # Builds the bundle if an OLM is available - depends on cluster being tested
+ build-bundle: ${{ steps.config-cluster.outputs.cluster-has-olm }}
+ # Both can be empty and so catalog source will not be created
+ catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }}
+ catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }}
+
+ - id: install-kamel-cluster-setup
+ name: Install Kamel Cluster Setup
+ uses: ./.github/actions/kamel-install-cluster-setup
+ with:
+ kube-admin-user-ctx: ${{ steps.config-cluster.outputs.cluster-kube-admin-user-ctx }}
+
+ - id: preflight-test
+ name: Preflight Check Test
+ uses: ./.github/actions/kamel-preflight-test
+ with:
+ catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }}
+ catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }}
+ image-namespace: ${{ steps.config-cluster.outputs.cluster-image-namespace }}
+ image-registry-host: ${{ steps.config-cluster.outputs.cluster-image-registry-pull-host }}
+ image-name: ${{ steps.build-kamel.outputs.build-binary-local-image-name }}
+ image-registry-insecure: ${{steps.config-cluster.outputs.cluster-image-registry-insecure }}
+ image-version: ${{ steps.build-kamel.outputs.build-binary-local-image-version }}
+
+ - id: report-problematic
+ name: List Tests Marked As Problematic
+ uses: ./.github/actions/kamel-report-problematic
+ with:
+ test-suite: namespace/install
+
+ - id: run-it
+ name: Run IT
+ shell: bash
+ run: |
+ ./.github/actions/e2e-install-native/exec-tests.sh \
+ -b "${{ steps.config-cluster.outputs.cluster-catalog-source-name }}" \
+ -c "${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }}" \
+ -i "${{ steps.config-cluster.outputs.cluster-image-namespace }}" \
+ -l "${{ steps.config-cluster.outputs.cluster-image-registry-pull-host }}" \
+ -n "${{ steps.build-kamel.outputs.build-binary-local-image-name }}" \
+ -s "${{steps.config-cluster.outputs.cluster-image-registry-insecure }}" \
+ -v "${{ steps.build-kamel.outputs.build-binary-local-image-version }}" \
+ -x "${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }}"
+
+ - name: Cleanup
+ uses: ./.github/actions/kamel-cleanup
+ if: ${{ always() }}
+ with:
+ catalog-source-name: ${{ steps.config-cluster.outputs.cluster-catalog-source-name }}
+ catalog-source-namespace: ${{ steps.config-cluster.outputs.cluster-catalog-source-namespace }}
+ image-namespace: ${{ steps.config-cluster.outputs.cluster-image-namespace }}
+ global-operator-namespace: ${{ steps.config-cluster.outputs.cluster-global-operator-namespace }}
diff --git a/.github/actions/e2e-install/exec-tests.sh b/.github/actions/e2e-install-native/exec-tests.sh
similarity index 89%
copy from .github/actions/e2e-install/exec-tests.sh
copy to .github/actions/e2e-install-native/exec-tests.sh
index 1b2a206ca..db67931c1 100755
--- a/.github/actions/e2e-install/exec-tests.sh
+++ b/.github/actions/e2e-install-native/exec-tests.sh
@@ -19,7 +19,7 @@
####
#
-# Execute the install tests
+# Execute the install native tests
#
####
@@ -101,7 +101,8 @@ if [ -n "${BUILD_CATALOG_SOURCE_NAMESPACE}" ]; then
export KAMEL_INSTALL_OLM_CHANNEL="${NEW_XY_CHANNEL}"
fi
-export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
+KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
+export KAMEL_INSTALL_MAVEN_REPOSITORIES
export KAMEL_INSTALL_REGISTRY=${REGISTRY_PULL_HOST}
export KAMEL_INSTALL_REGISTRY_INSECURE=${REGISTRY_INSECURE}
export KAMEL_INSTALL_OPERATOR_IMAGE=${CUSTOM_IMAGE}:${CUSTOM_VERSION}
@@ -115,12 +116,5 @@ export CAMEL_K_TEST_IMAGE_NAME=${CUSTOM_IMAGE}
export CAMEL_K_TEST_IMAGE_VERSION=${CUSTOM_VERSION}
export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${SAVE_FAILED_TEST_NS}
-# Then run all integration tests rather than ending on first failure
-set -e
-exit_code=0
-DO_TEST_PREBUILD=false make test-install || exit_code=1
-DO_TEST_PREBUILD=false make test-quarkus-native || exit_code=1
-set +e
-
-echo "Tests completed with exit code: ${exit_code}"
-exit ${exit_code}
+# Then run integration tests
+DO_TEST_PREBUILD=false make test-quarkus-native
diff --git a/.github/actions/e2e-install/exec-tests.sh b/.github/actions/e2e-install/exec-tests.sh
index 1b2a206ca..3b780d7f3 100755
--- a/.github/actions/e2e-install/exec-tests.sh
+++ b/.github/actions/e2e-install/exec-tests.sh
@@ -101,7 +101,8 @@ if [ -n "${BUILD_CATALOG_SOURCE_NAMESPACE}" ]; then
export KAMEL_INSTALL_OLM_CHANNEL="${NEW_XY_CHANNEL}"
fi
-export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
+KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
+export KAMEL_INSTALL_MAVEN_REPOSITORIES
export KAMEL_INSTALL_REGISTRY=${REGISTRY_PULL_HOST}
export KAMEL_INSTALL_REGISTRY_INSECURE=${REGISTRY_INSECURE}
export KAMEL_INSTALL_OPERATOR_IMAGE=${CUSTOM_IMAGE}:${CUSTOM_VERSION}
@@ -115,12 +116,5 @@ export CAMEL_K_TEST_IMAGE_NAME=${CUSTOM_IMAGE}
export CAMEL_K_TEST_IMAGE_VERSION=${CUSTOM_VERSION}
export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${SAVE_FAILED_TEST_NS}
-# Then run all integration tests rather than ending on first failure
-set -e
-exit_code=0
-DO_TEST_PREBUILD=false make test-install || exit_code=1
-DO_TEST_PREBUILD=false make test-quarkus-native || exit_code=1
-set +e
-
-echo "Tests completed with exit code: ${exit_code}"
-exit ${exit_code}
+# Then run integration tests
+DO_TEST_PREBUILD=false make test-install
diff --git a/.github/actions/e2e-knative/exec-tests.sh b/.github/actions/e2e-knative/exec-tests.sh
index 328571b3d..fd591cbb7 100755
--- a/.github/actions/e2e-knative/exec-tests.sh
+++ b/.github/actions/e2e-knative/exec-tests.sh
@@ -104,7 +104,8 @@ if [ -n "${BUILD_CATALOG_SOURCE_NAMESPACE}" ]; then
export KAMEL_INSTALL_OLM_CHANNEL="${NEW_XY_CHANNEL}"
fi
-export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
+KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
+export KAMEL_INSTALL_MAVEN_REPOSITORIES
export KAMEL_INSTALL_REGISTRY=${REGISTRY_PULL_HOST}
export KAMEL_INSTALL_REGISTRY_INSECURE=${REGISTRY_INSECURE}
export KAMEL_INSTALL_OPERATOR_IMAGE=${CUSTOM_IMAGE}:${CUSTOM_VERSION}
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 70ef4eef1..aafdc1522 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -65,9 +65,7 @@ concurrency:
jobs:
install-it:
-
runs-on: ubuntu-20.04
-
steps:
- name: Checkout code
uses: actions/checkout@v2
@@ -87,3 +85,25 @@ jobs:
with:
cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
cluster-kube-config-data: ${{ secrets.E2E_KUBE_CONFIG }}
+
+ native-it:
+ runs-on: ubuntu-20.04
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ with:
+ persist-credentials: false
+ submodules: recursive
+ - name: Convert input parameters to env vars
+ shell: bash
+ run: |
+ ./.github/workflows/manual-exec-process-inputs.sh \
+ -i "${{ github.event.inputs.pre-built-kamel-image }}" \
+ -p "${{ github.event.inputs.skip-problematic }}" \
+ -t "${{ github.event.inputs.test-filters }}"
+
+ - name: Execute Tests
+ uses: ./.github/actions/e2e-install-native
+ with:
+ cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
+ cluster-kube-config-data: ${{ secrets.E2E_KUBE_CONFIG }}
[camel-k] 03/04: chore(e2e): native test - add warm up before native build testing
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 429f133a04272d9ecc9d53a6d6fdde884f553d22
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Thu Sep 1 14:54:46 2022 +0900
chore(e2e): native test - add warm up before native build testing
---
e2e/namespace/native/native_test.go | 16 ++++++++++++++++
e2e/support/test_support.go | 17 +++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/e2e/namespace/native/native_test.go b/e2e/namespace/native/native_test.go
index 706306ee4..6ca81734e 100644
--- a/e2e/namespace/native/native_test.go
+++ b/e2e/namespace/native/native_test.go
@@ -65,8 +65,24 @@ func TestNativeIntegrations(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable)).
Should(Equal(corev1.ConditionFalse))
+ // Clean up
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("warm up before native build testing", func(t *testing.T) {
+ // The following native build test is under tight time constraints, so here it runs
+ // a warm up testing to make sure necessary jars are already downloaded.
+ name := "warm-up-yaml"
+ Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed())
+
+ Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
// Clean up
Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
+ Expect(DeleteKits(ns)).To(Succeed())
})
t.Run("automatic rollout deployment from fast-jar to native kit", func(t *testing.T) {
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 0bb3ecc39..d5053f735 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -1107,6 +1107,20 @@ func Kits(ns string, options ...interface{}) func() []v1.IntegrationKit {
}
}
+func DeleteKits(ns string) error {
+ kits := Kits(ns)()
+ if len(kits) == 0 {
+ return nil
+ }
+ for _, kit := range kits {
+ if err := TestClient().Delete(TestContext, &kit); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
func OperatorImage(ns string) func() string {
return func() string {
pod := OperatorPod(ns)()
@@ -1360,8 +1374,7 @@ func DeletePlatform(ns string) func() bool {
if pl == nil {
return true
}
- err := TestClient().Delete(TestContext, pl)
- if err != nil {
+ if err := TestClient().Delete(TestContext, pl); err != nil {
log.Error(err, "Got error while deleting the platform")
}
return false
[camel-k] 02/04: fix(e2e): native build requires more memory for Camel Quarkus 2.11
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8ddb2a3625e20ee4ea0b97d3fad5669b094e31d5
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Wed Aug 31 22:26:44 2022 +0900
fix(e2e): native build requires more memory for Camel Quarkus 2.11
---
e2e/namespace/native/native_test.go | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/e2e/namespace/native/native_test.go b/e2e/namespace/native/native_test.go
index 3c6533289..706306ee4 100644
--- a/e2e/namespace/native/native_test.go
+++ b/e2e/namespace/native/native_test.go
@@ -49,8 +49,9 @@ func TestNativeIntegrations(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-quarkus-native"
Expect(KamelInstallWithID(operatorID, ns,
- "--build-timeout", "15m0s",
- "--operator-resources", "limits.memory=4Gi",
+ "--build-timeout", "30m0s",
+ "--operator-resources", "limits.memory=4.5Gi",
+ "--maven-cli-option", "-Dquarkus.native.native-image-xmx=3g",
).Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -61,7 +62,11 @@ func TestNativeIntegrations(t *testing.T) {
).Execute()).To(Succeed())
Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseError))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable)).Should(Equal(corev1.ConditionFalse))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionKitAvailable)).
+ Should(Equal(corev1.ConditionFalse))
+
+ // Clean up
+ Expect(Kamel("delete", name, "-n", ns).Execute()).To(Succeed())
})
t.Run("automatic rollout deployment from fast-jar to native kit", func(t *testing.T) {
@@ -77,7 +82,7 @@ func TestNativeIntegrations(t *testing.T) {
// Check the fast-jar Kit is ready
Eventually(Kits(ns, withFastJarLayout, KitWithPhase(v1.IntegrationKitPhaseReady)),
- TestTimeoutVeryLong).Should(HaveLen(1))
+ TestTimeoutLong).Should(HaveLen(1))
fastJarKit := Kits(ns, withFastJarLayout, KitWithPhase(v1.IntegrationKitPhaseReady))()[0]
// Check the Integration uses the fast-jar Kit
@@ -87,14 +92,16 @@ func TestNativeIntegrations(t *testing.T) {
// Check the Integration is ready
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPod(ns, name), TestTimeoutShort).Should(WithTransform(getContainerCommand(), ContainSubstring("java")))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationPod(ns, name), TestTimeoutShort).
+ Should(WithTransform(getContainerCommand(), ContainSubstring("java")))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
// Check the native Kit is ready
Eventually(Kits(ns, withNativeLayout, KitWithPhase(v1.IntegrationKitPhaseReady)),
- TestTimeoutLong).Should(HaveLen(1))
+ TestTimeoutVeryLong).Should(HaveLen(1))
nativeKit := Kits(ns, withNativeLayout, KitWithPhase(v1.IntegrationKitPhaseReady))()[0]
// Check the Integration uses the native Kit
@@ -104,8 +111,10 @@ func TestNativeIntegrations(t *testing.T) {
// Check the Integration is still ready
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationPod(ns, name), TestTimeoutShort).Should(WithTransform(getContainerCommand(), MatchRegexp(".*camel-k-integration-.+-runner.*")))
- Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationPod(ns, name), TestTimeoutShort).
+ Should(WithTransform(getContainerCommand(), MatchRegexp(".*camel-k-integration-.+-runner.*")))
+ Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).
+ Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
})
[camel-k] 01/04: feat(e2e): add CAMEL_K_TEST_NS env var to specify namespace to run tests
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b82bc77388bafbad136c3dc02f4eb80fe77e6ae5
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Tue Aug 30 15:48:13 2022 +0900
feat(e2e): add CAMEL_K_TEST_NS env var to specify namespace to run tests
---
e2e/support/test_support.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 28eec818f..0bb3ecc39 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -2067,7 +2067,10 @@ func deleteTestNamespace(t *testing.T, ns ctrl.Object) {
func newTestNamespace(injectKnativeBroker bool) ctrl.Object {
brokerLabel := "eventing.knative.dev/injection"
- name := "test-" + uuid.New().String()
+ name := os.Getenv("CAMEL_K_TEST_NS")
+ if name == "" {
+ name = "test-" + uuid.New().String()
+ }
c := TestClient()
if oc, err := openshift.IsOpenShift(TestClient()); err != nil {