This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3a40f23710f8ab90cb914884f1aa5c52cbb804a4 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Mon Apr 29 10:54:47 2024 +0200 CAMEL-20680: prevent unreliable Kafka tests from running on the CI --- .../KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java | 8 +++----- .../KafkaBreakOnFirstErrorReleaseResourcesIT.java | 7 +------ .../KafkaBreakOnFirstErrorReplayOldMessagesIT.java | 8 +++----- .../kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java | 8 ++------ ...aBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java | 8 +++----- ...kaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java | 8 +++----- ...akOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java | 8 +++----- ...kaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java | 12 +++++------- 8 files changed, 23 insertions(+), 44 deletions(-) diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java index 361d540ec60..992f4579b23 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java @@ -35,8 +35,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,9 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * KafkaManualCommit and NOOP Commit Manager */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorOff"; public static final String TOPIC = "breakOnFirstErrorOff"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java index e9fbf115972..3a1046a2715 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java @@ -33,8 +33,6 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.awaitility.Awaitility; import org.junit.jupiter.api.*; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,11 +45,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") @DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", - disabledReason = "Consistently unreliable on shared environments") + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstError-20563"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java index 8efe6986cb1..c6a95252638 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReplayOldMessagesIT.java @@ -40,8 +40,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,9 +53,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * mimics the reproduction of the problem in https://github.com/CodeSmell/CamelKafkaOffset */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorReplayOldMessagesIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstError-20044"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java index b0fbe7d005a..4d98b547d14 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java @@ -38,8 +38,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,10 +50,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * mimics the reproduction of the problem in https://github.com/Krivda/camel-bug-reproduction */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") -@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Too slow to run on Github CI") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorSeekIssueIT extends BaseExclusiveKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstError-19894"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java index 32045520574..3fbf3f02028 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java @@ -35,8 +35,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,9 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Camel to handle when to commit an offset */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseExclusiveKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchIT"; public static final String TOPIC = "breakOnFirstErrorBatchIT"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java index 17c203afb28..7ffc434ad50 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT.java @@ -35,8 +35,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,9 +46,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * Camel default to use NOOP Commit Manager this means the route implementation MUST manage all offset commits */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchOnExceptionIT"; public static final String TOPIC = "breakOnFirstErrorBatchOnExceptionIT"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java index 48de110435b..32df79bb2ae 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT.java @@ -35,8 +35,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,9 +50,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * will demonstrate how to retry */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorWithBatchUsingKafkaManualCommitRetryIT extends BaseKafkaTestSupport { public static final String ROUTE_ID = "breakOnFirstErrorBatchRetryIT"; diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java index 07c4d714b95..8778256fc16 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java @@ -35,8 +35,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tags; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,12 +46,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Camel to handle when to commit an offset */ @Tags({ @Tag("breakOnFirstError") }) -@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS }, - architectures = { "amd64", "aarch64", "s390x" }, - disabledReason = "This test does not run reliably on ppc64le") +@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", + disabledReason = "Multiple problems: unreliable and slow (see CAMEL-20680)") class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT extends BaseKafkaTestSupport { - public static final String ROUTE_ID = "breakOnFirstErrorBatchIT"; - public static final String TOPIC = "breakOnFirstErrorBatchIT"; + public static final String ROUTE_ID = "breakOnFirstErrorBatchITSyncCommitManager"; + public static final String TOPIC = "breakOnFirstErrorBatchITSyncCommitManager"; private static final Logger LOG = LoggerFactory.getLogger(KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.class);