From c715b08715fe6f69880fc2a0a4658edc2fd0c004 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 17:07:38 -0500 Subject: [PATCH 1/2] Bump io.fabric8:kubernetes-client-bom from 6.13.4 to 6.13.5 (#1852) * Bump io.fabric8:kubernetes-client-bom from 6.13.4 to 6.13.5 Bumps [io.fabric8:kubernetes-client-bom](https://github.com/fabric8io/kubernetes-client) from 6.13.4 to 6.13.5. - [Release notes](https://github.com/fabric8io/kubernetes-client/releases) - [Changelog](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/fabric8io/kubernetes-client/compare/v6.13.4...v6.13.5) --- updated-dependencies: - dependency-name: io.fabric8:kubernetes-client-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Change fabric8 version in test --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Baxter --- spring-cloud-kubernetes-dependencies/pom.xml | 2 +- .../fabric8/Fabric8UserAgentDefaultConfigurationTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 724eb4a1..a8ea435b 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -32,7 +32,7 @@ Spring Cloud Kubernetes :: Dependencies Spring Cloud Kubernetes Dependencies - 6.13.4 + 6.13.5 19.0.2 3.4.2 diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java index b3a77508..c0ac865c 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java @@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests { @Test void testUserAgent() { String userAgent = client.getConfiguration().getUserAgent(); - assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.4"); + assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.5"); } } From 428ebab0b5b1efed2c8934bd9287e2de8580ca8e Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 31 Jan 2025 16:48:49 +0200 Subject: [PATCH 2/2] first test (#1853) Signed-off-by: wind57 --- .../maven-build-with-dry-run-for-tests/action.yaml | 2 +- .github/workflows/composites/pre-test-actions/action.yaml | 2 +- .../run-and-save-test-times-when-cache-missing/action.yaml | 2 +- .../run-and-save-test-times-when-cache-present/action.yaml | 2 +- spring-cloud-kubernetes-controllers/pom.xml | 3 --- spring-cloud-kubernetes-integration-tests/README | 7 ------- spring-cloud-kubernetes-integration-tests/pom.xml | 3 --- 7 files changed, 4 insertions(+), 17 deletions(-) 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 6a4b927a..3145fc9c 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 2b372d27..1a39eaa5 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 786cd0ce..8366aa32 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 15fb3abd..9cfbcaef 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 4f26e4b6..d633ae3a 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 14355d27..a1cc8c3e 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 1ed9a978..eb44772b 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