This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit aa668d014ff9d19f50c75059800d5f51bf086f64 Author: Peter Palaga <[email protected]> AuthorDate: Thu Apr 15 23:31:54 2021 +0200 Test skipped in native mode should be executed on default Java version at least #2389 --- .github/workflows/ci-build.yaml | 34 +++++++++++++++--------- integration-tests/fhir/pom.xml | 5 ++++ integration-tests/kubernetes/pom.xml | 5 ++++ tooling/scripts/test-categories.yaml | 2 ++ tooling/scripts/validate-github-workflows.groovy | 2 +- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index d461bde..bb7bfd5 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -146,30 +146,38 @@ jobs: sudo wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64" sudo chmod +x /usr/local/bin/yq - name: Integration Tests - env: - TEST_MODULES: ${{matrix.test-modules}} run: | - TEST_MODULES="" + set -x for MODULE in $(cat tooling/scripts/test-categories.yaml | yq r - "${{ matrix.category }}.*"); do if [ "${MODULE}" == "-" ]; then continue fi - TEST_MODULES="${TEST_MODULES} ${MODULE}" + MODULE="integration-tests/$(echo ${MODULE} | sed 's/^[ \t]*//;s/[ \t]*$//')" + if [ "x$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=ci.native.tests.skip -DforceStdout -q -f ${MODULE})" == "xtrue" ]; then + JVM_MODULES+=("${MODULE}") + else + NATIVE_MODULES+=("${MODULE}") + fi done - TEST_MODULES=$(echo ${TEST_MODULES} | sed 's/^[ \t]*//;s/[ \t]*$//') - - if [ -z "${TEST_MODULES}" ]; then + if [ ${#JVM_MODULES[@]} -eq 0 && ${#NATIVE_MODULES[@]} -eq 0 ]; then echo "No test modules were found for category ${{ matrix.category }}" exit 1 fi - for i in $TEST_MODULES - do modules+=("integration-tests/$i"); done IFS=, - eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \ - -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ - -Pnative,docker,ci \ - -pl "${modules[*]}" + if [[ ${JVM_MODULES[@]} ]]; then + eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean test \ + -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ + -Pdocker,ci \ + -pl "${JVM_MODULES[*]}" + fi + + if [[ ${NATIVE_MODULES[@]} ]]; then + eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \ + -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ + -Pnative,docker,ci \ + -pl "${NATIVE_MODULES[*]}" + fi - name: Fail if there are uncommitted changes shell: bash run: | diff --git a/integration-tests/fhir/pom.xml b/integration-tests/fhir/pom.xml index 431c199..31f746a 100644 --- a/integration-tests/fhir/pom.xml +++ b/integration-tests/fhir/pom.xml @@ -29,6 +29,11 @@ <name>Camel Quarkus :: Integration Tests :: FHIR</name> <description>Integration tests for Camel Quarkus FHIR extension</description> + <properties> + <!-- Takes too long or spends too much memory on GH actions --> + <ci.native.tests.skip>true</ci.native.tests.skip> + </properties> + <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml index 878ac29..bb70559 100644 --- a/integration-tests/kubernetes/pom.xml +++ b/integration-tests/kubernetes/pom.xml @@ -29,6 +29,11 @@ <name>Camel Quarkus :: Integration Tests :: Kubernetes</name> <description>Integration tests for Camel Quarkus Kubernetes extension</description> + <properties> + <!-- Takes too long or spends too much memory on GH actions --> + <ci.native.tests.skip>true</ci.native.tests.skip> + </properties> + <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index 1ad7109..1e56fef 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -178,6 +178,8 @@ platform: - aws2-grouped - paho-mqtt5 saas: + - fhir + - kubernetes - box - github - google diff --git a/tooling/scripts/validate-github-workflows.groovy b/tooling/scripts/validate-github-workflows.groovy index f45faeb..dd19fc6 100644 --- a/tooling/scripts/validate-github-workflows.groovy +++ b/tooling/scripts/validate-github-workflows.groovy @@ -30,7 +30,7 @@ final Set<String> executedBaseNames = [] as Set // Add any ignored itest modules here. Or prefix the module name with '#' to disable it // hystrix - https://github.com/apache/camel-quarkus/issues/1146 -final List<String> excludedModules = ['fhir', 'hystrix', 'kubernetes', 'support'] as List +final List<String> excludedModules = ['hystrix'] as List final Yaml parser = new Yaml() def testCategoryConfig = parser.load((jobDefPath.toFile()).text)
