From 7b0a46c07da1a22d8a4befc69b637ffcce25ec8c Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Fri, 29 Sep 2023 19:17:01 +0530 Subject: [PATCH] ci: remove workaround for clean disk action The issues are fixed from the clean disk action repo and we shouldn't require any workaround. Also, I'm not using git revert to revert the commit is earlier clean disk action was mentioned in every CI which was duplicate and now we have placed the action to composite yaml Signed-off-by: subhamkrai (cherry picked from commit e14f8c77109331161424450df3633ae8e32b40bc) --- .../workflows/canary-test-config/action.yaml | 6 ------ .../action.yaml | 6 ------ tests/scripts/github-action-helper.sh | 20 ------------------- 3 files changed, 32 deletions(-) diff --git a/.github/workflows/canary-test-config/action.yaml b/.github/workflows/canary-test-config/action.yaml index 2f939978c..1feb8c266 100644 --- a/.github/workflows/canary-test-config/action.yaml +++ b/.github/workflows/canary-test-config/action.yaml @@ -8,18 +8,12 @@ inputs: runs: using: "composite" steps: - - name: manually remove gcloud - shell: bash --noprofile --norc -eo pipefail -x {0} - run: | - tests/scripts/github-action-helper.sh remove_gcloud_in_runner - - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@main with: # this might remove tools that are actually needed, # if set to "true" but frees about 6 GB tool-cache: true - large-packages: false - name: setup golang uses: actions/setup-go@v2 diff --git a/.github/workflows/integration-test-config-latest-k8s/action.yaml b/.github/workflows/integration-test-config-latest-k8s/action.yaml index 04769d4b4..45646b8d1 100644 --- a/.github/workflows/integration-test-config-latest-k8s/action.yaml +++ b/.github/workflows/integration-test-config-latest-k8s/action.yaml @@ -11,18 +11,12 @@ inputs: runs: using: "composite" steps: - - name: manually remove gcloud - shell: bash --noprofile --norc -eo pipefail -x {0} - run: | - tests/scripts/github-action-helper.sh remove_gcloud_in_runner - - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@main with: # this might remove tools that are actually needed, # if set to "true" but frees about 6 GB tool-cache: true - large-packages: false - name: setup golang uses: actions/setup-go@v2 diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index 95b142e2e..b5dbd1f45 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -679,26 +679,6 @@ function test_csi_nfs_workload { kubectl exec -t pod/csinfs-demo-pod -- ls -alh /var/lib/www/html/ } -function remove_gcloud_in_runner() { - 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" - - 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 -} - function install_minikube_with_none_driver() { CRICTL_VERSION="v1.28.0" MINIKUBE_VERSION="v1.31.2"