merge 3.0.x

wind57 · Oct 2, 2023 · 6c0de29 · 6c0de29
2 parents d5ba80e + 9b01949
commit 6c0de29
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 55 deletions.
diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml
@@ -5,7 +5,9 @@ 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 ..
diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml
@@ -4,39 +4,12 @@ runs:
   using: "composite"
   steps:
 
-    ### this is supposed to be simpler, but it's a work-around for:
-    ### https://github.com/jlumbroso/free-disk-space/issues/14
-
-    - name: manually remove gcloud
-      shell: bash
-      run: |
-        gcloud_sdk_root=$(gcloud info --format='value(installation.sdk_root)')
-        gcloud_global_config=$(gcloud info --format='value(config.paths.global_config_dir)')
-        
-        echo "will remove directory : $gcloud_sdk_root"
-        echo "will remove directory : $gcloud_global_config"
-        
-        sudo rm -fr $gcloud_sdk_root
-        sudo rm -fr $gcloud_global_config
-
-    - name: same as 'large-packages' but without 'google-cloud-sdk'
-      shell: bash
-      run: | 
-        sudo apt-get remove -y '^dotnet-.*'
-        sudo apt-get remove -y '^llvm-.*'
-        sudo apt-get remove -y 'php.*'
-        sudo apt-get remove -y '^mongodb-.*'
-        sudo apt-get remove -y '^mysql-.*'
-        sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
-        sudo apt-get autoremove -y
-        sudo apt-get clean
-
     - name: Free Disk Space
       uses: jlumbroso/free-disk-space@main
       with:
         tool-cache: true
         android: true
         dotnet: true
         haskell: true
-        large-packages: false
+        large-packages: true
         swap-storage: true
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
@@ -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
@@ -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
@@ -62,15 +62,18 @@
 	</scm>
 
 	<properties>
+		<!-- in our github actions run, we save surefire/failsafe reports in a path that looks like this: -->
+		<!-- surefire-report/1/... , where "1" (and other numbers like this) are the index of the github matrix -->
+		<!-- where this is running. When outside the github actions, for example locally/jenkins, we will simply store -->
+		<!-- the reports in a directory: "surefire-reports/one/..." -->
+		<CURRENT_INSTANCE>one</CURRENT_INSTANCE>
 		<!-- Dependency Versions -->
 		<mockito-inline.version>4.8.1</mockito-inline.version>
 		<spring-cloud-commons.version>4.0.5-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-config.version>4.0.5-SNAPSHOT</spring-cloud-config.version>
 		<spring-cloud-bus.version>4.0.1</spring-cloud-bus.version>
 		<spring-cloud-contract.version>4.0.5-SNAPSHOT</spring-cloud-contract.version>
 
-		<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
-
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true
 		</maven-checkstyle-plugin.failsOnViolation>
@@ -205,8 +208,18 @@
 					<includes>
 						<include>${testsToRun}</include>
 					</includes>
+					<reportsDirectory>${project.build.directory}/surefire-reports/${CURRENT_INSTANCE}</reportsDirectory>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<configuration>
+					<reportsDirectory>${project.build.directory}/failsafe-reports/${CURRENT_INSTANCE}</reportsDirectory>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>

diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -35,28 +35,6 @@
 
 	</build>
 
-	<profiles>
-		<profile>
-			<id>run-on-github-actions</id>
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-failsafe-plugin</artifactId>
-							<version>3.1.2</version>
-						</plugin>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-surefire-plugin</artifactId>
-							<version>3.1.2</version>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-		</profile>
-	</profiles>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>