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
The following commit(s) were added to refs/heads/main by this push:
new 7597d063c5d CAMEL-19228: separate tests that run only with Couchbase 7
than those that run with 6
7597d063c5d is described below
commit 7597d063c5d389ea581f00143ed432c799a07bbe
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed May 17 16:35:03 2023 +0200
CAMEL-19228: separate tests that run only with Couchbase 7 than those that
run with 6
---
components/camel-couchbase/pom.xml | 41 ++++++++++++++++++++++
.../integration/ConsumeMessagesWithLimitIT.java | 3 ++
.../integration/ConsumeResumeStrategyIT.java | 3 ++
.../integration/ProduceMessagesSimpleIT.java | 3 ++
.../integration/ProduceMessagesWithAutoIDIT.java | 3 ++
.../couchbase/integration/RemoveMessagesIT.java | 3 ++
6 files changed, 56 insertions(+)
diff --git a/components/camel-couchbase/pom.xml
b/components/camel-couchbase/pom.xml
index 5476866e481..469e5caf260 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -73,6 +73,47 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipITs>${skipITs}</skipITs>
+ <skipTests>${skipTests}</skipTests>
+ <reuseForks>true</reuseForks>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <skipITs>${skipITs}</skipITs>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ <excludedGroups>couchbase-7</excludedGroups>
+ </configuration>
+ </execution>
+ <execution>
+ <id>couchbase-7</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ <configuration>
+ <groups>couchbase-7</groups>
+
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ <systemPropertyVariables>
+
<couchbase.container>couchbase/server:7.1.1</couchbase.container>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<!-- Couchbase container is only available for x86 64 and ARM 64
-->
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 3ad27caa599..e7a038b48b3 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
@@ -22,10 +22,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.AfterEach;
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.DisabledIfSystemProperty;
@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
disabledReason = "Flaky on Apache CI")
+@Tags({@Tag("couchbase-6")})
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 08fd668fdda..938d11fe0ee 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
@@ -29,6 +29,8 @@ import org.apache.camel.support.resume.Resumables;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
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.DisabledIfSystemProperty;
@@ -36,6 +38,7 @@ import static
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_
import static org.awaitility.Awaitility.await;
@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
disabledReason = "Flaky on Apache CI")
+@Tags({@Tag("couchbase-6")})
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 0789b40df26..61370a4b285 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
@@ -19,8 +19,11 @@ package org.apache.camel.component.couchbase.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.couchbase.CouchbaseConstants;
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;
+@Tags({@Tag ("couchbase-7")})
public class ProduceMessagesSimpleIT extends CouchbaseIntegrationTestBase {
@Test
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 c6cc56ae9f2..4515b1be92e 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
@@ -18,8 +18,11 @@ package org.apache.camel.component.couchbase.integration;
import org.apache.camel.builder.RouteBuilder;
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;
+@Tags({@Tag("couchbase-7")})
public class ProduceMessagesWithAutoIDIT extends CouchbaseIntegrationTestBase {
@Test
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 e2f21d1727d..d30d23b4f96 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
@@ -19,11 +19,14 @@ package org.apache.camel.component.couchbase.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
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 static
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE;
import static
org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID;
+@Tags({@Tag("couchbase-7")})
public class RemoveMessagesIT extends CouchbaseIntegrationTestBase {
@BeforeEach
