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
commit 6ee731e3bc2f1cc95b45be4c56f27a7e4579079e Author: Pasquale Congiusti <[email protected]> AuthorDate: Tue Jun 18 15:51:48 2024 +0200 chore(ci): remove problematic flag --- .github/actions/e2e-common/action.yml | 60 ------------------ .github/actions/e2e-install/action.yml | 6 -- .github/actions/e2e-knative/action.yml | 6 -- .github/actions/e2e-telemetry/action.yml | 6 -- .github/workflows/builder.yml | 9 +-- .github/workflows/common.yml | 20 ++---- .github/workflows/install.yml | 26 +------- .github/workflows/knative.yml | 9 +-- .github/workflows/manual-exec-process-inputs.sh | 84 ------------------------- .github/workflows/native.yml | 10 +-- .github/workflows/nightly-automatic-updates.yml | 2 + .github/workflows/nightly-native-test.yml | 2 + .github/workflows/telemetry.yml | 11 +--- e2e/README.md | 1 - e2e/advanced/operator_metrics_test.go | 12 ---- e2e/common/cli/dev_mode_test.go | 11 ---- e2e/common/cli/run_test.go | 18 ------ e2e/support/test_support.go | 2 +- 18 files changed, 16 insertions(+), 279 deletions(-) diff --git a/.github/actions/e2e-common/action.yml b/.github/actions/e2e-common/action.yml index b96e2921e..01463c4fa 100644 --- a/.github/actions/e2e-common/action.yml +++ b/.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 @@ -75,44 +62,6 @@ runs: 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 +79,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 }} diff --git a/.github/actions/e2e-install/action.yml b/.github/actions/e2e-install/action.yml index d54913d3e..35ab77210 100644 --- a/.github/actions/e2e-install/action.yml +++ b/.github/actions/e2e-install/action.yml @@ -54,12 +54,6 @@ runs: 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: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-knative/action.yml b/.github/actions/e2e-knative/action.yml index 87210ef5a..86e001a05 100644 --- a/.github/actions/e2e-knative/action.yml +++ b/.github/actions/e2e-knative/action.yml @@ -57,12 +57,6 @@ runs: - name: Install Knative uses: ./.github/actions/kamel-install-knative - - 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: run-it name: Run IT shell: bash diff --git a/.github/actions/e2e-telemetry/action.yml b/.github/actions/e2e-telemetry/action.yml index 1504f7b9a..d85d54964 100644 --- a/.github/actions/e2e-telemetry/action.yml +++ b/.github/actions/e2e-telemetry/action.yml @@ -60,12 +60,6 @@ runs: otlp-collector-image-name: otel/opentelemetry-collector otlp-collector-image-version: 0.102.0 - - 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 diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 50f5b480c..4bce8e392 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -64,19 +64,12 @@ jobs: publisher: ["Jib"] steps: + - name: Checkout code uses: actions/checkout@v4 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" - name: Builder Tests uses: ./.github/actions/e2e-builder diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 0527e2a8e..85707b34a 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -62,19 +62,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code uses: actions/checkout@v4 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" + - name: Common tests uses: ./.github/actions/e2e-common with: @@ -85,19 +79,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code uses: actions/checkout@v4 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" + - name: Common advanced tests uses: ./.github/actions/e2e-common with: diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 73f84ac68..31a80d76c 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -59,11 +59,13 @@ jobs: non-olm: runs-on: ubuntu-latest steps: + - name: Checkout code uses: actions/checkout@v4 with: persist-credentials: false submodules: recursive + - name: Install Helm shell: bash run: | @@ -72,14 +74,6 @@ jobs: echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list sudo apt-get update sudo apt-get install helm - - 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" - name: Install (Non OLM) uses: ./.github/actions/e2e-install @@ -96,14 +90,6 @@ jobs: 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" - name: Install (OLM) uses: ./.github/actions/e2e-install-olm @@ -120,14 +106,6 @@ jobs: 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" - name: Upgrade uses: ./.github/actions/e2e-install-upgrade diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml index cf2d4b097..d188ed9b2 100644 --- a/.github/workflows/knative.yml +++ b/.github/workflows/knative.yml @@ -63,14 +63,6 @@ jobs: 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" - name: Knative Tests uses: ./.github/actions/e2e-knative @@ -81,6 +73,7 @@ jobs: yaks-test: runs-on: ubuntu-latest steps: + - name: Checkout code uses: actions/checkout@v4 with: diff --git a/.github/workflows/manual-exec-process-inputs.sh b/.github/workflows/manual-exec-process-inputs.sh deleted file mode 100755 index 26b89418e..000000000 --- a/.github/workflows/manual-exec-process-inputs.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# --------------------------------------------------------------------------- -# 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. -# --------------------------------------------------------------------------- - -set -e - -# -# Used to unit testing this script -# -if [ -z "$GITHUB_ENV" ]; then - GITHUB_ENV="/tmp/GITHUB_ENV" - rm -f "${GITHUB_ENV}" -fi - -while getopts ":i:p:q:t:" opt; do - case "${opt}" in - i) - PRE_BUILT_IMAGE=${OPTARG} - ;; - p) - SKIP_PROBLEMATIC=${OPTARG} - ;; - q) - LOG_LEVEL=${OPTARG} - ;; - t) - TEST_FILTERS=${OPTARG} - ;; - :) - echo "ERROR: Option -$OPTARG requires an argument" - exit 1 - ;; - \?) - echo "ERROR: Invalid option -$OPTARG" - exit 1 - ;; - esac -done -shift $((OPTIND-1)) - -if [ -n "${LOG_LEVEL}" ]; then - echo "CAMEL_K_LOG_LEVEL=${LOG_LEVEL}" >> $GITHUB_ENV -fi - -if [ -n "${PRE_BUILT_IMAGE}" ]; then - echo "DEBUG_USE_EXISTING_IMAGE=${PRE_BUILT_IMAGE}" >> $GITHUB_ENV -fi - -# -# Avoid problematic tests only if parameter set to true -# -if [ "${SKIP_PROBLEMATIC}" == "true" ]; then - echo "CAMEL_K_TEST_SKIP_PROBLEMATIC=true" >> $GITHUB_ENV -fi - -# -# Adds -run args to filter tests in test suites -# -if [ -n "${TEST_FILTERS}" ]; then - filters=($(echo ${TEST_FILTERS} | tr "," "\n")) - - #Print the split string - for filter in "${filters[@]}" - do - pair=($(echo ${filter} | tr "=" " ")) - echo "Adding run filter for ${pair[0]} tests" - echo "${pair[0]}=-run ${pair[1]}" >> $GITHUB_ENV - done -fi diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml index 0c20496cb..a1d68f8f7 100644 --- a/.github/workflows/native.yml +++ b/.github/workflows/native.yml @@ -63,19 +63,13 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout code uses: actions/checkout@v4 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" + - name: Quarkus Native test uses: ./.github/actions/e2e-native with: diff --git a/.github/workflows/nightly-automatic-updates.yml b/.github/workflows/nightly-automatic-updates.yml index d6403840b..a92ff7600 100644 --- a/.github/workflows/nightly-automatic-updates.yml +++ b/.github/workflows/nightly-automatic-updates.yml @@ -37,12 +37,14 @@ jobs: runs-on: ubuntu-latest name: Automatic updates on ${{ matrix.ref-branch }} branch steps: + - name: "Checkout code" uses: actions/checkout@v4 with: ref: ${{ matrix.ref-branch }} persist-credentials: false submodules: recursive + - name: "Run upgrade action" uses: ./.github/actions/automatic-updates with: diff --git a/.github/workflows/nightly-native-test.yml b/.github/workflows/nightly-native-test.yml index 89dd88190..498ed9785 100644 --- a/.github/workflows/nightly-native-test.yml +++ b/.github/workflows/nightly-native-test.yml @@ -41,12 +41,14 @@ jobs: if: github.repository == 'apache/camel-k' runs-on: ubuntu-latest steps: + - name: "Checkout code" uses: actions/checkout@v4 with: ref: ${{ matrix.ref-branch }} persist-credentials: false submodules: recursive + - name: Quarkus native test uses: ./.github/actions/e2e-native with: diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml index 3f7fd6848..26eabe198 100644 --- a/.github/workflows/telemetry.yml +++ b/.github/workflows/telemetry.yml @@ -55,23 +55,14 @@ concurrency: jobs: telemetry-it: - runs-on: ubuntu-latest - steps: + - name: Checkout code uses: actions/checkout@v4 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 }}" \ - -q "${{ github.event.inputs.log-level }}" \ - -t "${{ github.event.inputs.test-filters }}" - name: Execute Tests uses: ./.github/actions/e2e-telemetry diff --git a/e2e/README.md b/e2e/README.md index a65207527..4de299811 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -8,7 +8,6 @@ You can set some environment variables to change the behavior of the E2E test su | Env | Default | Description | |-----------------------------------------|-----------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------| -| CAMEL_K_TEST_SKIP_PROBLEMATIC | false | Skips tests that are marked to be problematic (flaky) on certain environments (e.g. on OpenShift). | | CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE | false | Used to not remove the temporary test namespaces after the test run. Enables better analysis of resources after the test | | CAMEL_K_TEST_LOG_LEVEL | info | Logging level used to run the tests and used in Maven commands run by the operator (if level is `debug` the Maven commands use `-X` option). | | CAMEL_K_TEST_MAVEN_CLI_OPTIONS | {} | Maven CLI options used to run Camel K integrations during the tests. | diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go index 5efa4c163..61ab56179 100644 --- a/e2e/advanced/operator_metrics_test.go +++ b/e2e/advanced/operator_metrics_test.go @@ -27,7 +27,6 @@ import ( "context" "fmt" "math" - "os" "testing" "time" @@ -45,20 +44,9 @@ import ( v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" ) -/* -* TODO -* The duration_seconds tests keep randomly failing on OCP4 with slightly different duration values -* May need to lessen the strict checking parameters -* -* Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment. - */ func TestMetrics(t *testing.T) { t.Parallel() - if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" { - t.Skip("WARNING: Test marked as problematic ... skipping") - } - WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { name := RandomizedSuffixName("java") operatorID := "camel-k-metrics" diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go index 0c84b4676..ef98b95bf 100644 --- a/e2e/common/cli/dev_mode_test.go +++ b/e2e/common/cli/dev_mode_test.go @@ -38,17 +38,6 @@ import ( func TestRunDevMode(t *testing.T) { WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { - /* - * TODO - * The changing of the yaml file constant from "string" to "magic" is not being - * picked up when deploying on OCP4 and so the test is failing. - * - * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment. - */ - if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" { - t.Skip("WARNING: Test marked as problematic ... skipping") - } - t.Run("run yaml dev mode", func(t *testing.T) { ctx, cancel := context.WithCancel(ctx) defer cancel() diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go index 4a1a05cd4..57491b44e 100644 --- a/e2e/common/cli/run_test.go +++ b/e2e/common/cli/run_test.go @@ -181,16 +181,7 @@ func TestKamelCLIRun(t *testing.T) { }) WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { - /* - * TODO - * The dependency cannot be read by maven while building. See #3708 - * - * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment. - */ t.Run("Run with http dependency", func(t *testing.T) { - if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" { - t.Skip("WARNING: Test marked as problematic ... skipping") - } // Requires a local integration platform in order to resolve the insecure registry // Install platform (use the installer to get staging if present) g.Expect(KamelInstallWithID(t, ctx, operatorID, ns, "--skip-operator-setup")).To(Succeed()) @@ -208,16 +199,7 @@ func TestKamelCLIRun(t *testing.T) { }) WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { - /* - * TODO - * The dependency cannot be read by maven while building. See #3708 - * - * Adding CAMEL_K_TEST_SKIP_PROBLEMATIC env var for the moment. - */ t.Run("Run with http dependency using options", func(t *testing.T) { - if os.Getenv("CAMEL_K_TEST_SKIP_PROBLEMATIC") == "true" { - t.Skip("WARNING: Test marked as problematic ... skipping") - } // Requires a local integration platform in order to resolve the insecure registry // Install platform (use the installer to get staging if present) g.Expect(KamelInstallWithID(t, ctx, operatorID, ns, "--skip-operator-setup")).To(Succeed()) diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index 64dbf0bc5..a784263c0 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -293,7 +293,7 @@ func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID strin var installArgs []string - installArgs = []string{"install", "-n", namespace, "--operator-id", operatorID, "--skip-cluster-setup"} + installArgs = []string{"install", "-n", namespace, "--operator-id", operatorID} if !pkgutil.StringSliceExists(args, "--build-timeout") { // if --build-timeout is not explicitly passed as an argument, try to configure it
