diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml index 307451c8f5..f9df2c519d 100644 --- a/.github/workflows/composites/build-controllers-project/action.yaml +++ b/.github/workflows/composites/build-controllers-project/action.yaml @@ -5,7 +5,13 @@ runs: steps: - name: build controllers project shell: bash + env: + CURRENT_INDEX: ${{ matrix.current_index }} run: | cd spring-cloud-kubernetes-controllers - .././mvnw -T 1C -U clean install + .././mvnw -DCURRENT_INSTANCE=${CURRENT_INDEX} -T 1C -U clean install cd .. + + - name: show target path + shell: bash + run: ls spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/target/surefire-reports diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml index b1d18fef80..d262d89bbd 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml @@ -60,8 +60,9 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${TEST_ARG[@]} \ + -DCURRENT_INSTANCE=${CURRENT_INDEX} \ -e clean install \ - -P 'sonar, run-on-github-actions' -nsu --batch-mode \ + -P sonar -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml index 7130a907c9..ce2242c3fc 100644 --- a/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml +++ b/.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml @@ -149,8 +149,9 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${tests_to_run_in_current_index} \ + -DCURRENT_INSTANCE=${CURRENT_INDEX} \ -e clean install \ - -P 'sonar, run-on-github-actions' -nsu --batch-mode \ + -P sonar -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ -Dmaven.wagon.http.pool=false \ diff --git a/pom.xml b/pom.xml index e17b33d4ec..a9e81e2449 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ + one 4.8.1 4.1.0-SNAPSHOT @@ -69,8 +70,6 @@ 4.1.0-SNAPSHOT 4.1.0-SNAPSHOT - 3.1.0 - true true @@ -205,8 +204,18 @@ ${testsToRun} + ${project.build.directory}/surefire-reports/${CURRENT_INSTANCE} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${project.build.directory}/failsafe-reports/${CURRENT_INSTANCE} + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 78f14a07e9..5e989134ee 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -35,29 +35,6 @@ - - - run-on-github-actions - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.1.2 - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.1.2 - - - - - - -