diff --git a/.github/workflows/composites/clean-space/action.yaml b/.github/workflows/composites/clean-space/action.yaml
index 69d61642fd..2f9906ce2e 100644
--- a/.github/workflows/composites/clean-space/action.yaml
+++ b/.github/workflows/composites/clean-space/action.yaml
@@ -3,10 +3,33 @@ description: clean space
runs:
using: "composite"
steps:
- - name: apt-update
+
+ ### 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: |
- sudo apt-get update
+ 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
@@ -15,5 +38,5 @@ runs:
android: true
dotnet: true
haskell: true
- large-packages: true
+ large-packages: false
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
index 39e79ebdd7..b1d18fef80 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
@@ -61,7 +61,7 @@ runs:
./mvnw -s .settings.xml \
-DtestsToRun=${TEST_ARG[@]} \
-e clean install \
- -U -P sonar -nsu --batch-mode \
+ -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 \
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 ce8c81cff3..7130a907c9 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,7 +150,7 @@ runs:
./mvnw -s .settings.xml \
-DtestsToRun=${tests_to_run_in_current_index} \
-e clean install \
- -U -P sonar -nsu --batch-mode \
+ -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 \
diff --git a/.github/workflows/composites/save-controller-images/action.yaml b/.github/workflows/composites/save-controller-images/action.yaml
deleted file mode 100644
index 056b1b2adb..0000000000
--- a/.github/workflows/composites/save-controller-images/action.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: save controller docker images
-description: save controller docker images
-runs:
- using: "composite"
- steps:
- - name: save controller docker images
- shell: bash
- run: |
- mkdir -p /tmp/docker/images
- TAG=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
- cd spring-cloud-kubernetes-controllers
- while read controller_image; do
- docker save -o /tmp/docker/images/${controller_image}.tar docker.io/springcloud/${controller_image}:$TAG
- done < <(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q | grep -v 'spring-cloud-kubernetes-controllers')
- cd ..
diff --git a/.github/workflows/composites/save-integration-tests-images/action.yaml b/.github/workflows/composites/save-integration-tests-images/action.yaml
deleted file mode 100644
index cbc92e55f7..0000000000
--- a/.github/workflows/composites/save-integration-tests-images/action.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: save integration tests docker images
-description: save integration tests docker images
-runs:
- using: "composite"
- steps:
- - name: save integration tests docker images
- shell: bash
- run: |
- mkdir -p /tmp/docker/images
- TAG=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
- cd spring-cloud-kubernetes-integration-tests
- while read integ_test; do
- docker save -o /tmp/docker/images/${integ_test}.tar docker.io/springcloud/${integ_test}:$TAG
- done < <(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q \
- | grep -v 'spring-cloud-kubernetes-integration-tests' \
- | grep -v 'spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps' \
- | grep -v 'spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app' \
- | grep -v 'spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps' \
- | grep -v 'spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app' )
- cd ..
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 6264d4c008..4fcc70635b 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -29,9 +29,6 @@ jobs:
- name: checkout project
uses: actions/checkout@v2
- - name: clean space
- uses: ./.github/workflows/composites/clean-space
-
- name: set env variables
uses: ./.github/workflows/composites/env-variables
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 d6bc61dbc0..e13b268c78 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -75,11 +75,11 @@
maven-surefire-plugin
- 2.22.2
+ 3.1.2
maven-failsafe-plugin
- 2.22.2
+ 3.1.2
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index ebd7479cf8..1dae169f19 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -32,8 +32,32 @@
+
+
+
+ run-on-github-actions
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 3.1.2
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.1.2
+
+
+
+
+
+
+