chore(ci): simplify github actions execution

.github/actions/e2e-common/action.yml

@@ -48,19 +48,6 @@ runs:
     with:
       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
@@ -69,50 +56,11 @@ runs:
       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 }}
+      build-bundle: false
       # 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: install-global-operator
-    name: "Install Global Operator"
-    if: ${{ steps.config-cluster.outputs.cluster-global-operator-namespace }}
-    uses: ./.github/actions/kamel-install-global-operator
-    with:
-      global-operator-namespace: ${{ steps.config-cluster.outputs.cluster-global-operator-namespace }}
-      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: global/common
-
   - id: run-it
     name: Run IT
     shell: bash
@@ -130,12 +78,3 @@ runs:
         -x "${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }}" \
         -y "${{ inputs.smoke-test-only }}" \
         -z "${{ inputs.with-custom-install }}"
-
-  - 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 }}

.github/actions/e2e-common/exec-tests.sh

@@ -143,10 +143,22 @@ export CAMEL_K_E2E_FAST_SETUP="true"
 set -e
 exit_code=0
 if [ "${SMOKE_TEST_ONLY}" == "true" ]; then
+  kubectl create ns camel-k
+  REGISTRY="${KAMEL_INSTALL_REGISTRY}" make install-k8s-global
+  # Let's wait for the IntegrationPlatform to be ready before starting any operation
+  kubectl wait --for=jsonpath='{.status.phase}'=Ready itp camel-k -n camel-k --timeout=45s
+
   DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make test-smoke || exit_code=1
 elif [ "${CUSTOM_INSTALL_TEST}" == "true" ]; then
+  make install-crds
+
   DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make test-advanced || exit_code=1
 else
+  kubectl create ns camel-k
+  REGISTRY="${KAMEL_INSTALL_REGISTRY}" make install-k8s-global
+  # Let's wait for the IntegrationPlatform to be ready before starting any operation
+  kubectl wait --for=jsonpath='{.status.phase}'=Ready itp camel-k -n camel-k --timeout=45s
+
   DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make test-common || exit_code=1
 fi
 set +e