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 3c162ca786e798fa661c0f5c201ee04205055af4
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Fri Nov 17 17:28:59 2023 +0100
(chores) camel-couchbase: testing improvements
- Re-enable running by default outside of ASF and GH CI environments
- Update 7.1 tests to 7.1.5
- enable testing on Arm
---
components/camel-couchbase/pom.xml | 3 +--
.../couchbase/integration/ConsumeMessagesWithLimitIT.java | 14 ++++++++++----
.../couchbase/integration/ConsumeResumeStrategyIT.java | 14 ++++++++++----
.../couchbase/integration/ProduceMessagesSimpleIT.java | 14 ++++++++++----
.../couchbase/integration/ProduceMessagesWithAutoIDIT.java | 12 +++++++++---
.../component/couchbase/integration/RemoveMessagesIT.java | 12 +++++++++---
6 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/components/camel-couchbase/pom.xml
b/components/camel-couchbase/pom.xml
index 7c5ff4cec75..1e2ea8f7b5e 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -35,7 +35,6 @@
<!-- Couchbase container is not available on these platforms -->
<skipITs.ppc64le>true</skipITs.ppc64le>
<skipITs.s390x>true</skipITs.s390x>
- <skipITs.aarch64>true</skipITs.aarch64>
</properties>
<dependencies>
@@ -117,7 +116,7 @@
<groups>couchbase-7</groups>
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
<systemPropertyVariables>
-
<couchbase.container>couchbase/server:7.1.1</couchbase.container>
+
<couchbase.container>couchbase/server:7.1.5</couchbase.container>
</systemPropertyVariables>
</configuration>
</execution>
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 adc12870cd7..bb348c05ecb 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
@@ -25,11 +25,17 @@ 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.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@EnabledIfSystemProperty(named = "couchbase.enable.it", matches = "true",
- disabledReason = "Too resource intensive for most
systems to run reliably")
-@Tags({ @Tag("couchbase-6") })
+@DisabledIfSystemProperties({
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too resource constrained
for this test"),
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"github.com", disabledReason = "Flaky on GitHub Actions"),
+ @DisabledIfSystemProperty(named = "couchbase.enable.it", matches =
"false",
+ disabledReason = "Too resource intensive for most systems to
run reliably"),
+})
+@Tags({ @Tag("couchbase-71") })
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 1792e52309a..17693e1cc51 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
@@ -32,14 +32,20 @@ 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.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_RESUME_ACTION;
import static org.awaitility.Awaitility.await;
-@EnabledIfSystemProperty(named = "couchbase.enable.it", matches = "true",
- disabledReason = "Too resource intensive for most
systems to run reliably")
-@Tags({ @Tag("couchbase-6") })
+@DisabledIfSystemProperties({
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too resource constrained
for this test"),
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"github.com", disabledReason = "Flaky on GitHub Actions"),
+ @DisabledIfSystemProperty(named = "couchbase.enable.it", matches =
"false",
+ disabledReason = "Too resource intensive for most systems to
run reliably"),
+})
+@Tags({ @Tag("couchbase-71") })
public class ConsumeResumeStrategyIT extends CouchbaseIntegrationTestBase {
static class TestCouchbaseResumeAdapter implements ResumeActionAware {
volatile boolean setResumeActionCalled;
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
index 22ebc78e107..4513b7e3729 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
@@ -22,10 +22,16 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-@EnabledIfSystemProperty(named = "couchbase.enable.it", matches = "true",
- disabledReason = "Too resource intensive for most
systems to run reliably")
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+
+@DisabledIfSystemProperties({
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too resource constrained
for this test"),
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"github.com", disabledReason = "Flaky on GitHub Actions"),
+ @DisabledIfSystemProperty(named = "couchbase.enable.it", matches =
"false",
+ disabledReason = "Too resource intensive for most systems to
run reliably"),
+})
@Tags({ @Tag("couchbase-7") })
public class ProduceMessagesSimpleIT extends CouchbaseIntegrationTestBase {
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
index e930fbddca8..5d3e7f13fe5 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
@@ -21,10 +21,16 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-@EnabledIfSystemProperty(named = "couchbase.enable.it", matches = "true",
- disabledReason = "Too resource intensive for most
systems to run reliably")
+@DisabledIfSystemProperties({
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too resource constrained
for this test"),
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"github.com", disabledReason = "Flaky on GitHub Actions"),
+ @DisabledIfSystemProperty(named = "couchbase.enable.it", matches =
"false",
+ disabledReason = "Too resource intensive for most systems to
run reliably"),
+})
@Tags({ @Tag("couchbase-7") })
public class ProduceMessagesWithAutoIDIT extends CouchbaseIntegrationTestBase {
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
index adc76b4ed89..947ec8723a8 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
@@ -22,13 +22,19 @@ 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.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE;
import static
org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID;
-@EnabledIfSystemProperty(named = "couchbase.enable.it", matches = "true",
- disabledReason = "Too resource intensive for most
systems to run reliably")
+@DisabledIfSystemProperties({
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"apache.org",
+ disabledReason = "Apache CI nodes are too resource constrained
for this test"),
+ @DisabledIfSystemProperty(named = "ci.env.name", matches =
"github.com", disabledReason = "Flaky on GitHub Actions"),
+ @DisabledIfSystemProperty(named = "couchbase.enable.it", matches =
"false",
+ disabledReason = "Too resource intensive for most systems to
run reliably"),
+})
@Tags({ @Tag("couchbase-7") })
public class RemoveMessagesIT extends CouchbaseIntegrationTestBase {
