This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 e4df09a2053 CAMEL-19659 - reactivate FHIR Integration tests (#14536)
e4df09a2053 is described below
commit e4df09a205330916936926609aa4d929be43fb40
Author: Aurélien Pupier <[email protected]>
AuthorDate: Sat Jun 15 08:19:35 2024 +0200
CAMEL-19659 - reactivate FHIR Integration tests (#14536)
- upgrade container version, locally gained 20 seconds on 2 minutes test
execution
- provide a retry startup attempt to improve stability
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java | 3 ---
.../test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java | 3 ---
.../apache/camel/component/fhir/FhirCustomClientConfigurationIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java | 3 ---
.../java/org/apache/camel/component/fhir/FhirExtraParametersIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirReadIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java | 3 ---
.../test/java/org/apache/camel/component/fhir/FhirTransactionIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java | 3 ---
.../src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java | 3 ---
.../org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java | 3 ---
.../camel/test/infra/fhir/services/FhirLocalContainerService.java | 1 +
.../org/apache/camel/test/infra/fhir/services/container.properties | 2 +-
20 files changed, 2 insertions(+), 55 deletions(-)
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
index f19031c47b7..1a62abb223f 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCapabilitiesIT.java
@@ -26,7 +26,6 @@ import
org.apache.camel.component.fhir.internal.FhirCapabilitiesApiMethod;
import org.hl7.fhir.r4.model.CapabilityStatement;
import org.hl7.fhir.r4.model.Enumerations;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,8 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirCapabilities}
APIs. The class source won't be generated
* again if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirCapabilitiesIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirCapabilitiesIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
index 52cc7b7f9e4..9d33ca34f94 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirConfigurationIT.java
@@ -30,7 +30,6 @@ import
org.apache.camel.component.fhir.internal.FhirCreateApiMethod;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.PluginHelper;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -42,8 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Test class for {@link FhirConfiguration} APIs.
*/
@ExtendWith(MockitoExtension.class)
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirConfigurationIT extends AbstractFhirTestSupport {
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
index 8476ba21e09..f0bdb732dbf 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCreateIT.java
@@ -31,7 +31,6 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.hl7.fhir.r4.model.HumanName;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Test class for {@link org.apache.camel.component.fhir.api.FhirCreate} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirCreateIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirCreateIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
index 1c041ff910c..d715162a052 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirCustomClientConfigurationIT.java
@@ -55,15 +55,12 @@ import
org.apache.camel.component.fhir.internal.FhirCreateApiMethod;
import org.hl7.fhir.instance.model.api.IBaseBundle;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test class for {@link FhirConfiguration} APIs.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirCustomClientConfigurationIT extends AbstractFhirTestSupport {
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
index f59ce70a0f1..4dfa8b7e6c2 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirDeleteIT.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.fhir.api.ExtraParameters;
import org.apache.camel.component.fhir.internal.FhirApiCollection;
import org.apache.camel.component.fhir.internal.FhirDeleteApiMethod;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,8 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Test class for {@link org.apache.camel.component.fhir.api.FhirDelete} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirDeleteIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirDeleteIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
index 190902046d2..910a98f939f 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirExtraParametersIT.java
@@ -26,7 +26,6 @@ import
org.apache.camel.component.fhir.internal.FhirSearchApiMethod;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,8 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirSearch} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirExtraParametersIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirExtraParametersIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
index 329f416b9d8..b917039feb2 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirHistoryIT.java
@@ -26,7 +26,6 @@ import
org.apache.camel.component.fhir.internal.FhirHistoryApiMethod;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,8 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirHistory}
APIs. The class source won't be generated
* again if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirHistoryIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirHistoryIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
index 2f8e3d6c995..b27e81ba930 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirLoadPageIT.java
@@ -33,7 +33,6 @@ import org.hl7.fhir.r4.model.HumanName;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,8 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirLoadPage}
APIs. The class source won't be generated
* again if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirLoadPageIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirLoadPageIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
index da2441ba604..0472246aab7 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirMetaIT.java
@@ -27,7 +27,6 @@ import org.hl7.fhir.instance.model.api.IBaseMetaType;
import org.hl7.fhir.r4.model.Meta;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,8 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirMeta} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirMetaIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirMetaIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
index f1794cdcb5c..8c154ff4664 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirOperationIT.java
@@ -28,7 +28,6 @@ import org.hl7.fhir.r4.model.Parameters;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,8 +37,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test class for {@link org.apache.camel.component.fhir.api.FhirOperation}
APIs.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirOperationIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirOperationIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
index f867efd6aa8..f250258e73c 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirPatchIT.java
@@ -31,7 +31,6 @@ import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Test class for {@link org.apache.camel.component.fhir.api.FhirPatch} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirPatchIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirPatchIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
index 48748d7e3b8..45166b36487 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirReadIT.java
@@ -26,7 +26,6 @@ import
org.apache.camel.component.fhir.internal.FhirReadApiMethod;
import org.hl7.fhir.r4.model.IdType;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,8 +36,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirRead} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirReadIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirReadIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
index 54203905a39..bc9315b4a3b 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSearchIT.java
@@ -22,7 +22,6 @@ import
org.apache.camel.component.fhir.internal.FhirSearchApiMethod;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,8 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirSearch} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirSearchIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirSearchIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
index f3f5b00075f..cdb53973a3e 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirSimpleIT.java
@@ -26,7 +26,6 @@ import org.hl7.fhir.r4.model.HumanName;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,8 +33,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test simple scenario, without custom component configuration
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirSimpleIT extends AbstractFhirTestSupport {
private static final String PATH_PREFIX =
FhirApiCollection.getCollection().getApiName(FhirCreateApiMethod.class).getName();
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
index f59c32d5488..4ff3194f1e1 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirTransactionIT.java
@@ -31,7 +31,6 @@ import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.HumanName;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +42,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Test class for {@link org.apache.camel.component.fhir.api.FhirTransaction}
APIs. The class source won't be generated
* again if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirTransactionIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirTransactionIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
index 064b636b6c4..56f6158fce6 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirUpdateIT.java
@@ -28,7 +28,6 @@ import
org.apache.camel.component.fhir.internal.FhirApiCollection;
import org.apache.camel.component.fhir.internal.FhirUpdateApiMethod;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,8 +39,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* Test class for {@link org.apache.camel.component.fhir.api.FhirUpdate} APIs.
The class source won't be generated again
* if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirUpdateIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirUpdateIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
index d20175261e0..9d6e9c459e1 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/FhirValidateIT.java
@@ -28,7 +28,6 @@ import org.hl7.fhir.r4.model.OperationOutcome;
import org.hl7.fhir.r4.model.OperationOutcome.OperationOutcomeIssueComponent;
import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,8 +39,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Test class for {@link org.apache.camel.component.fhir.api.FhirValidate}
APIs. The class source won't be generated
* again if the generator MOJO finds it under src/test/java.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class FhirValidateIT extends AbstractFhirTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(FhirValidateIT.class);
diff --git
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
index a3c6b2ba569..2cb231a51d6 100644
---
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
+++
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/Hl7v2PatientToFhirPatientIT.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -33,8 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This test demonstrates how to convert a HL7V2 patient to a FHIR dtsu3
Patient and then insert it into a FHIR server.
*/
-@DisabledIfSystemProperty(named = "ci.env.name", matches = "apache.org",
- disabledReason = "Apache CI nodes are too resource
constrained for this test - see CAMEL-19659")
public class Hl7v2PatientToFhirPatientIT extends AbstractFhirTestSupport {
/*
diff --git
a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
index c2b0405d46a..c809256c636 100644
---
a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
+++
b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
@@ -53,6 +53,7 @@ public class FhirLocalContainerService implements
FhirService, ContainerService<
.withNetworkAliases(containerName)
.withExposedPorts(FhirProperties.DEFAULT_SERVICE_PORT)
.withStartupTimeout(Duration.ofMinutes(3L))
+ .withStartupAttempts(5)
.withEnv("hapi.fhir.allow_multiple_delete", "true")
.withEnv("hapi.fhir.fhir_version", "R4")
.withEnv("hapi.fhir.reuse_cached_search_results_millis", "-1")
diff --git
a/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
b/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
index 739d079ada6..9f27e267fa2 100644
---
a/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
+++
b/test-infra/camel-test-infra-fhir/src/test/resources/org/apache/camel/test/infra/fhir/services/container.properties
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-fhir.container=hapiproject/hapi:v6.8.3
\ No newline at end of file
+fhir.container=hapiproject/hapi:v7.2.0
\ No newline at end of file
