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 60667be0b1a1968c07da52a7a9b3b93d77210326 Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Sat Sep 10 09:04:07 2022 +0200 (chores) camel-couchbase: adjust disabled tests for the Apache CI --- .../component/couchbase/integration/ConsumeMessagesWithLimitIT.java | 4 ++-- .../component/couchbase/integration/ConsumeResumeStrategyIT.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java index 09a77bce6c4..f3832d26b4b 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java @@ -23,9 +23,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -@DisabledIfEnvironmentVariable(named = "JENKINS_URL", matches = ".*apache.org", disabledReason = "Flaky on Apache CI") +@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", disabledReason = "Flaky on Apache CI") public class ConsumeMessagesWithLimitIT extends CouchbaseIntegrationTestBase { @BeforeEach diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java index 507339b9982..574416464e7 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java @@ -30,12 +30,12 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; import static org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_RESUME_ACTION; import static org.awaitility.Awaitility.await; -@DisabledIfEnvironmentVariable(named = "JENKINS_URL", matches = ".*apache.org", disabledReason = "Flaky on Apache CI") +@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org", disabledReason = "Flaky on Apache CI") public class ConsumeResumeStrategyIT extends CouchbaseIntegrationTestBase { static class TestCouchbaseResumeAdapter implements ResumeActionAware { volatile boolean setResumeActionCalled;