From 662c6990ade288ba3ca93407e0e0934cab2c9647 Mon Sep 17 00:00:00 2001 From: wind57 Date: Thu, 28 Sep 2023 13:53:54 +0300 Subject: [PATCH] add profile --- .../build-controllers-project/action.yaml | 2 +- .../action.yaml | 19 +++++++-------- .../action.yaml | 1 + spring-cloud-kubernetes-controllers/pom.xml | 23 +++++++++++++++++++ .../pom.xml | 23 +++++++++++++++++++ .../pom.xml | 6 +++++ 6 files changed, 64 insertions(+), 10 deletions(-) diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml index 307451c8f5..e3db1e885d 100644 --- a/.github/workflows/composites/build-controllers-project/action.yaml +++ b/.github/workflows/composites/build-controllers-project/action.yaml @@ -7,5 +7,5 @@ runs: shell: bash run: | cd spring-cloud-kubernetes-controllers - .././mvnw -T 1C -U clean install + .././mvnw -P 'run-on-github-actions' -T 1C -U clean install cd .. 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..0cf8e19369 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 @@ -59,15 +59,16 @@ runs: echo "version of java: $version" ./mvnw -s .settings.xml \ - -DtestsToRun=${TEST_ARG[@]} \ - -e clean install \ - -P 'sonar, run-on-github-actions' -nsu --batch-mode \ - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ - -Dhttp.keepAlive=false \ - -Dmaven.wagon.http.pool=false \ - -Dmaven.wagon.http.retryHandler.class=standard \ - -Dmaven.wagon.http.retryHandler.count=3 \ - -Dskip.build.image=true + -DtestsToRun=${TEST_ARG[@]} \ + -D CURRENT_INSTANCE=${CURRENT_INDEX} \ + -e clean install \ + -P 'sonar, run-on-github-actions' -nsu --batch-mode \ + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ + -Dhttp.keepAlive=false \ + -Dmaven.wagon.http.pool=false \ + -Dmaven.wagon.http.retryHandler.class=standard \ + -Dmaven.wagon.http.retryHandler.count=3 \ + -Dskip.build.image=true fi touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt 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..ad88b9d002 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 @@ -150,6 +150,7 @@ runs: ./mvnw -s .settings.xml \ -DtestsToRun=${tests_to_run_in_current_index} \ -e clean install \ + -D CURRENT_INSTANCE=${CURRENT_INDEX} \ -P 'sonar, run-on-github-actions' -nsu --batch-mode \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dhttp.keepAlive=false \ diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml index 5a3af4f85e..e1f83fe407 100644 --- a/spring-cloud-kubernetes-controllers/pom.xml +++ b/spring-cloud-kubernetes-controllers/pom.xml @@ -18,4 +18,27 @@ spring-cloud-kubernetes-configserver + + + run-on-github-actions + + one + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + ${project.build.directory}/surefire-reports/${CURRENT_INSTANCE} + + + + + + + + diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index e13b268c78..c3a41137be 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -84,4 +84,27 @@ + + + run-on-github-actions + + one + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + ${project.build.directory}/surefire-reports/${CURRENT_INSTANCE} + + + + + + + + diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 1dae169f19..d3a5a84ebc 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -38,6 +38,9 @@ run-on-github-actions + + one + @@ -45,6 +48,9 @@ org.apache.maven.plugins maven-failsafe-plugin 3.1.2 + + ${project.build.directory}/failsafe-reports/${CURRENT_INSTANCE} +