[camel-quarkus] branch master updated: Remove hystrix from test-categories.yaml

[pp...@apache.org]

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

ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/master by this push:
     new 30111ea  Remove hystrix from test-categories.yaml
30111ea is described below

commit 30111eacf22f00c8a1934ce3ec0ab2be7586b83e
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Fri Jan 8 09:34:42 2021 +0100

    Remove hystrix from test-categories.yaml
---
 .../org/apache/camel/quarkus/component/hystrix/it/HystrixTest.java     | 3 ---
 tooling/scripts/test-categories.yaml                                   | 1 -
 tooling/scripts/validate-github-workflows.groovy                       | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/integration-tests/hystrix/src/test/java/org/apache/camel/quarkus/component/hystrix/it/HystrixTest.java b/integration-tests/hystrix/src/test/java/org/apache/camel/quarkus/component/hystrix/it/HystrixTest.java
index 84b651e..1835e76 100644
--- a/integration-tests/hystrix/src/test/java/org/apache/camel/quarkus/component/hystrix/it/HystrixTest.java
+++ b/integration-tests/hystrix/src/test/java/org/apache/camel/quarkus/component/hystrix/it/HystrixTest.java
@@ -20,14 +20,11 @@ import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
 import static org.hamcrest.core.Is.is;
 
 @QuarkusTest
 @QuarkusTestResource(HystrixTestResource.class)
-// https://github.com/apache/camel-quarkus/issues/1146
-@DisabledIfEnvironmentVariable(named = "CI", matches = "true")
 class HystrixTest {
 
     @Test
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 0d7c05c..726e84b 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -79,7 +79,6 @@ foundation:
   - file
   - foundation
   - headersmap
-  - hystrix
   - jta
   - jsonpath
   - micrometer
diff --git a/tooling/scripts/validate-github-workflows.groovy b/tooling/scripts/validate-github-workflows.groovy
index bdf9a78..f45faeb 100644
--- a/tooling/scripts/validate-github-workflows.groovy
+++ b/tooling/scripts/validate-github-workflows.groovy
@@ -29,7 +29,8 @@ final Path jobDefPath = treeRootDir.resolve(testCategoriesDefRelPath)
 final Set<String> executedBaseNames = [] as Set
 
 // Add any ignored itest modules here. Or prefix the module name with '#' to disable it
-final List<String> excludedModules = ['fhir', 'kubernetes', 'support'] as List
+// hystrix - https://github.com/apache/camel-quarkus/issues/1146
+final List<String> excludedModules = ['fhir', 'hystrix', 'kubernetes', 'support'] as List
 
 final Yaml parser = new Yaml()
 def testCategoryConfig = parser.load((jobDefPath.toFile()).text)