You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gf...@apache.org on 2024/06/10 09:01:44 UTC
(camel-k) 01/02: fix/5484 remove CAMEL_K_TEST_SKIP_PROBLEMATIC var
This is an automated email from the ASF dual-hosted git repository.
gfournier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 29da4af4ff615172f10b3fc161a01d3da48fadd0
Author: Jono <jo...@apache.org>
AuthorDate: Sun Jun 9 00:44:32 2024 +1200
fix/5484 remove CAMEL_K_TEST_SKIP_PROBLEMATIC var
---
.github/workflows/builder.yml | 5 -----
.github/workflows/common.yml | 6 ------
.github/workflows/install.yml | 7 -------
.github/workflows/knative.yml | 5 -----
.github/workflows/manual-exec-process-inputs.sh | 10 ----------
.github/workflows/native.yml | 5 -----
.github/workflows/telemetry.yml | 5 -----
docs/modules/ROOT/pages/contributing/e2e.adoc | 6 +-----
e2e/README.md | 3 +--
e2e/advanced/operator_metrics_test.go | 7 -------
e2e/common/cli/dev_mode_test.go | 5 -----
e2e/common/cli/run_test.go | 10 ----------
12 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index aeb729e44..6583552b2 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -56,10 +56,6 @@ on:
pre-built-kamel-image:
description: 'Kamel image url for skipping building of kamel stages. Used for debugging'
required: false
- skip-problematic:
- description: 'Whether tests marked as problematic should be skipped - false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
- required: false
- default: false
test-filters:
description: |
Filter the tests in this test suite by assigning the test pattern to TEST_KNATIVE_RUN,
@@ -90,7 +86,6 @@ jobs:
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 }}"
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index bdd2634b4..1df675dac 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -59,10 +59,6 @@ on:
pre-built-kamel-image:
description: 'Kamel image url for skipping building of kamel stages. Used for debugging'
required: false
- skip-problematic:
- description: 'Whether tests marked as problematic should be skipped - false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
- required: false
- default: false
test-filters:
description: |
List of comma-separated key/value pairs to filter the tests in this test suite:
@@ -91,7 +87,6 @@ jobs:
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
@@ -114,7 +109,6 @@ jobs:
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
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 714a69909..34720f9ea 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -57,10 +57,6 @@ on:
pre-built-kamel-image:
description: 'Kamel image url for skipping building of kamel stages. Used for debugging'
required: false
- skip-problematic:
- description: 'Whether tests marked as problematic should be skipped - false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
- required: false
- default: false
test-filters:
description: |
List of comma-separated key/value pairs to filter the tests in this test suite:
@@ -95,7 +91,6 @@ jobs:
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 }}"
@@ -119,7 +114,6 @@ jobs:
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 }}"
@@ -143,7 +137,6 @@ jobs:
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 }}"
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index 5900fbff7..5730c8e2f 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -55,10 +55,6 @@ on:
pre-built-kamel-image:
description: 'Kamel image url for skipping building of kamel stages. Used for debugging'
required: false
- skip-problematic:
- description: 'Whether tests marked as problematic should be skipped - false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
- required: false
- default: false
test-filters:
description: |
Filter the tests in this test suite by assigning the test pattern to TEST_KNATIVE_RUN,
@@ -84,7 +80,6 @@ jobs:
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 }}"
diff --git a/.github/workflows/manual-exec-process-inputs.sh b/.github/workflows/manual-exec-process-inputs.sh
index 26b89418e..1e57427ec 100755
--- a/.github/workflows/manual-exec-process-inputs.sh
+++ b/.github/workflows/manual-exec-process-inputs.sh
@@ -32,9 +32,6 @@ while getopts ":i:p:q:t:" opt; do
i)
PRE_BUILT_IMAGE=${OPTARG}
;;
- p)
- SKIP_PROBLEMATIC=${OPTARG}
- ;;
q)
LOG_LEVEL=${OPTARG}
;;
@@ -61,13 +58,6 @@ 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
#
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
index fcd0e99e3..c7f090fbf 100644
--- a/.github/workflows/native.yml
+++ b/.github/workflows/native.yml
@@ -50,10 +50,6 @@ on:
pre-built-kamel-image:
description: 'Kamel image url for skipping building of kamel stages. Used for debugging'
required: false
- skip-problematic:
- description: 'Whether tests marked as problematic should be skipped - false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
- required: false
- default: false
test-filters:
description: |
Filter the tests in this test suite by assigning the test pattern to TEST_NATIVE_RUN,
@@ -80,7 +76,6 @@ jobs:
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
diff --git a/.github/workflows/telemetry.yml b/.github/workflows/telemetry.yml
index 1e31ce1bb..331669ac5 100644
--- a/.github/workflows/telemetry.yml
+++ b/.github/workflows/telemetry.yml
@@ -55,10 +55,6 @@ on:
pre-built-kamel-image:
description: 'Kamel image url for skipping building of kamel stages. Used for debugging'
required: false
- skip-problematic:
- description: 'Whether tests marked as problematic should be skipped - false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
- required: false
- default: false
test-filters:
description: |
Filter the tests in this test suite by assigning the test pattern to TEST_TELEMETRY_RUN,
@@ -85,7 +81,6 @@ jobs:
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 }}"
diff --git a/docs/modules/ROOT/pages/contributing/e2e.adoc b/docs/modules/ROOT/pages/contributing/e2e.adoc
index 91b81d6bd..f37c226ee 100644
--- a/docs/modules/ROOT/pages/contributing/e2e.adoc
+++ b/docs/modules/ROOT/pages/contributing/e2e.adoc
@@ -41,11 +41,7 @@ Each group tests a specific feature of Camel K. Typically any new test should be
It's important to know that a subset of `common` named `test-smoke` is used as smoke test in the nightly release process. We want to keep this group of test as fast as possible.
=== Configure End To End tests runs with env vars
-Some e2e test runs parameters can be configured usually with env vars.
-Most of them are located at https://github.com/apache/camel-k/tree/main/e2e/support/test_support.go[e2e/support/test_support.go] in `init` and `kamelInstallWithContext` functions.
-A list of the most commonly used:
-
-* `CAMEL_K_TEST_SKIP_PROBLEMATIC`: set it to `true` to skip tests that might fail.
+For some e2e test runs parameters can be configured usually with env vars. Refer to the Camel K End-To-End test https://github.com/apache/camel-k/tree/main/e2e#environment-variables[environment-variables].
[[testing-operator]]
== Testing Operator under development
diff --git a/e2e/README.md b/e2e/README.md
index a65207527..e5ba93876 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -1,6 +1,6 @@
# Camel K End-To-End tests
-This directory contains the suite of test that are run on a CI to ensure the stability of the product and no regression are introduced at each PR. The full documentation can be found at https://camel.apache.org/camel-k/next/contributing/e2e.html
+This directory contains the suite of tests that are run during a CI build to ensure the stability of the product by checking that no regression defects are introduced by a PR. The full documentation can be found at https://camel.apache.org/camel-k/next/contributing/e2e.html
## Environment variables
@@ -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..0edc1680e 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"
@@ -49,16 +48,10 @@ import (
* 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..29ad7977e 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -42,12 +42,7 @@ func TestRunDevMode(t *testing.T) {
* 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)
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 4a1a05cd4..31a5bad67 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -184,13 +184,8 @@ func TestKamelCLIRun(t *testing.T) {
/*
* 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())
@@ -211,13 +206,8 @@ func TestKamelCLIRun(t *testing.T) {
/*
* 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())