summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2023-10-18 10:39:02 +0800
committerGitHub <noreply@github.com>2023-10-18 10:39:02 +0800
commite32892977f38b5e8d7d163b3da94bd0a997f6444 (patch)
tree70cf27915e3a57f268a694e7ec7b390df6e78e17
parentMerge pull request #4977 from Shelley-BaoYue/automated-cherry-pick-of-#4702-u... (diff)
parentcleanup unused images and packages (diff)
downloadkubeedge-e32892977f38b5e8d7d163b3da94bd0a997f6444.tar.gz
Merge pull request #5091 from Shelley-BaoYue/release-1.14
fix ci: update dependency tool version and cleanup unused images
-rw-r--r--.github/workflows/main.yaml12
-rwxr-xr-xcloud/test/integration/scripts/execute.sh2
-rwxr-xr-xtests/scripts/keadm_e2e.sh4
3 files changed, 17 insertions, 1 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 04fd2f6bc..462d2019b 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -193,6 +193,9 @@ jobs:
with:
fetch-depth: 0
+ - name: cleanup images
+ run: docker system prune -a -f
+
- name: Retrieve saved kubeedge/build-tools image
uses: actions/download-artifact@v3
with:
@@ -252,6 +255,9 @@ jobs:
with:
fetch-depth: 0
+ - name: cleanup images
+ run: docker system prune -a -f
+
- name: Retrieve saved kubeedge/build-tools image
uses: actions/download-artifact@v3
with:
@@ -305,6 +311,9 @@ jobs:
run: |
containerd config default | sudo tee /etc/containerd/config.toml && sudo systemctl restart containerd.service
+ - name: cleanup images
+ run: docker system prune -a -f
+
- run: make keadm_e2e
docker_build:
@@ -322,4 +331,7 @@ jobs:
with:
fetch-depth: 0
+ - name: cleanup images
+ run: docker system prune -a -f
+
- run: make image
diff --git a/cloud/test/integration/scripts/execute.sh b/cloud/test/integration/scripts/execute.sh
index 813bc9852..b9bb13211 100755
--- a/cloud/test/integration/scripts/execute.sh
+++ b/cloud/test/integration/scripts/execute.sh
@@ -22,7 +22,7 @@ ENVTEST_BIN_DIR=""
function do_preparation() {
which setup-envtest &> /dev/null || {
- go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+ go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20231013144025-0e9da2e3cab7
sudo cp $GOPATH/bin/setup-envtest /usr/bin/
}
diff --git a/tests/scripts/keadm_e2e.sh b/tests/scripts/keadm_e2e.sh
index 9d8bd758a..6370044aa 100755
--- a/tests/scripts/keadm_e2e.sh
+++ b/tests/scripts/keadm_e2e.sh
@@ -91,6 +91,10 @@ function start_kubeedge() {
sleep 3
kubectl get node | grep edge-node | grep -q -w Ready && break
done
+
+ # cleanup unused images and packages
+ docker rmi kubeedge/cloudcore:$IMAGE_TAG kubeedge/installation-package:$IMAGE_TAG
+ rm cloudcore.tar installation-package.tar
}
function run_test() {