diff --git a/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml b/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml index 6a4b927ab1..3145fc9cac 100644 --- a/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml +++ b/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml @@ -8,7 +8,7 @@ runs: shell: bash run: | ./mvnw install -B \ - -Dskip.build.image=true \ + -Dspring-boot.build-image.skip=true \ -DskipTests -DskipITs \ -T 1C -U -q diff --git a/.github/workflows/composites/pre-test-actions/action.yaml b/.github/workflows/composites/pre-test-actions/action.yaml index 2b372d2737..1a39eaa5ec 100644 --- a/.github/workflows/composites/pre-test-actions/action.yaml +++ b/.github/workflows/composites/pre-test-actions/action.yaml @@ -24,7 +24,7 @@ runs: - name: build project shell: bash run: | - ./mvnw clean install -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q + ./mvnw clean install -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q - name: build controllers project uses: ./.github/workflows/composites/build-controllers-project 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 786cd0ce95..8366aa3252 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 @@ -47,7 +47,7 @@ runs: -Dmaven.wagon.http.pool=false \ -Dmaven.wagon.http.retryHandler.class=standard \ -Dmaven.wagon.http.retryHandler.count=3 \ - -Dskip.build.image=true + -Dspring-boot.build-image.skip=true 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 15fb3abd1b..9cfbcaefd3 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 @@ -156,7 +156,7 @@ runs: -Dmaven.wagon.http.pool=false \ -Dmaven.wagon.http.retryHandler.class=standard \ -Dmaven.wagon.http.retryHandler.count=3 \ - -Dskip.build.image=true + -Dspring-boot.build-image.skip=true touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml index 4f26e4b6c3..d633ae3a80 100644 --- a/spring-cloud-kubernetes-controllers/pom.xml +++ b/spring-cloud-kubernetes-controllers/pom.xml @@ -33,9 +33,6 @@ build-image - - ${skip.build.image} - package build-image-no-fork diff --git a/spring-cloud-kubernetes-integration-tests/README b/spring-cloud-kubernetes-integration-tests/README index 14355d27f4..a1cc8c3e96 100644 --- a/spring-cloud-kubernetes-integration-tests/README +++ b/spring-cloud-kubernetes-integration-tests/README @@ -13,9 +13,6 @@ you must name the image with the same name as the module. For example: build-image - - ${skip.build.image} - package build-image-no-fork @@ -36,7 +33,3 @@ Notice this line: docker.io/springcloud/${project.artifactId}:${project.version} You must follow the same convention. - -One more important part in this configuration is : "${skip.build.image}". -We use this setting in the build pipeline where in some stages we skip the image build, -only to have it build in some latter ones. diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 1ed9a978a2..eb44772b34 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -38,9 +38,6 @@ build-image - - ${skip.build.image} - package build-image-no-fork