You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/10/24 18:40:06 UTC

[camel] branch main updated (6d82a8f4303 -> a02a3b45218)

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 6d82a8f4303 CAMEL-18148: API cleanups
     new 1cf70d71164 (chores) camel-aws2-kms: adjust memory settings and JVM behavior for the tests
     new a02a3b45218 (chores) camel-aws2-kms: disable flaky test on Github

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components/camel-aws/camel-aws2-kms/pom.xml              | 16 +++++++++++++++-
 .../component/aws2/kms/localstack/KmsCreateKeyIT.java    |  2 ++
 .../component/aws2/kms/localstack/KmsDisableKeyIT.java   |  2 ++
 .../component/aws2/kms/localstack/KmsListKeysIT.java     |  2 ++
 4 files changed, 21 insertions(+), 1 deletion(-)


[camel] 02/02: (chores) camel-aws2-kms: disable flaky test on Github

Posted by or...@apache.org.
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 a02a3b4521843030686515fcf8bfe2a67b8bce8e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Oct 24 14:11:33 2022 +0200

    (chores) camel-aws2-kms: disable flaky test on Github
---
 .../org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java  | 2 ++
 .../org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java | 2 ++
 .../org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
index 37759047865..58c172a8831 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
@@ -24,11 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.aws2.kms.KMS2Constants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Apache CI")
 public class KmsCreateKeyIT extends Aws2KmsBase {
 
     @EndpointInject
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
index 150688b3ba1..eb8666d6743 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
@@ -24,12 +24,14 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.aws2.kms.KMS2Constants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
 import software.amazon.awssdk.services.kms.model.ListKeysResponse;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Apache CI")
 public class KmsDisableKeyIT extends Aws2KmsBase {
 
     @EndpointInject
diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
index 2b21fd5ac04..973610adad2 100644
--- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
+++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
@@ -24,11 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.aws2.kms.KMS2Constants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import software.amazon.awssdk.services.kms.model.ListKeysResponse;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Apache CI")
 public class KmsListKeysIT extends Aws2KmsBase {
 
     @EndpointInject


[camel] 01/02: (chores) camel-aws2-kms: adjust memory settings and JVM behavior for the tests

Posted by or...@apache.org.
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 1cf70d71164f71ae5b1c990c14ae448ab1627332
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Oct 24 10:29:22 2022 +0200

    (chores) camel-aws2-kms: adjust memory settings and JVM behavior for the tests
---
 components/camel-aws/camel-aws2-kms/pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml
index f93ca0b51a6..db268b1f3d7 100644
--- a/components/camel-aws/camel-aws2-kms/pom.xml
+++ b/components/camel-aws/camel-aws2-kms/pom.xml
@@ -17,7 +17,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -33,6 +34,7 @@
     <description>A Camel Amazon KMS Web Service Component Version 2</description>
 
     <properties>
+        <camel.surefire.forkTimeout>1200</camel.surefire.forkTimeout>
     </properties>
 
     <dependencies>
@@ -77,4 +79,16 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                <argLine>${camel.surefire.fork.vmargs} -XX:+ExitOnOutOfMemoryError -Xmx2G</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>