Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/composites/pre-test-actions/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions spring-cloud-kubernetes-controllers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
<executions>
<execution>
<id>build-image</id>
<configuration>
<skip>${skip.build.image}</skip>
</configuration>
<phase>package</phase>
<goals>
<goal>build-image-no-fork</goal>
Expand Down
7 changes: 0 additions & 7 deletions spring-cloud-kubernetes-integration-tests/README
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ you must name the image with the same name as the module. For example:
<executions>
<execution>
<id>build-image</id>
<configuration>
<skip>${skip.build.image}</skip>
</configuration>
<phase>package</phase>
<goals>
<goal>build-image-no-fork</goal>
Expand All @@ -36,7 +33,3 @@ Notice this line:
<imageName>docker.io/springcloud/${project.artifactId}:${project.version}</imageName>

You must follow the same convention.

One more important part in this configuration is : "<skip>${skip.build.image}</skip>".
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.
3 changes: 0 additions & 3 deletions spring-cloud-kubernetes-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<executions>
<execution>
<id>build-image</id>
<configuration>
<skip>${skip.build.image}</skip>
</configuration>
<phase>package</phase>
<goals>
<goal>build-image-no-fork</goal>
Expand Down
Loading