From 7c5fe96a0a915223d22c559da1d1677775182605 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Thu, 19 Feb 2026 10:36:23 +0545 Subject: [PATCH 1/3] ci: separate cache locations Signed-off-by: Saw-jan --- .woodpecker/build.yaml | 4 ++-- .woodpecker/cache-python.yaml | 6 +++--- .woodpecker/purge-cache.yaml | 7 +++++-- .woodpecker/ui-tests.yaml | 10 +++++----- test/gui/woodpecker/gui_test_reports.sh | 2 +- test/gui/woodpecker/script.sh | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 4ccf07cfd..e65848470 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -46,5 +46,5 @@ steps: <<: *minio_environment commands: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -a -r /woodpecker/desktop/build/bin s3/$CACHE_BUCKET/desktop-build/${CI_COMMIT_SHA}/ - - mc ls --recursive s3/$CACHE_BUCKET/desktop-build + - mc cp -a -r /woodpecker/desktop/build/bin s3/$CACHE_BUCKET/desktop/bin-build/${CI_COMMIT_SHA}/ + - mc ls --recursive s3/$CACHE_BUCKET/desktop/bin-build diff --git a/.woodpecker/cache-python.yaml b/.woodpecker/cache-python.yaml index d920101b2..3a1adb114 100644 --- a/.woodpecker/cache-python.yaml +++ b/.woodpecker/cache-python.yaml @@ -35,7 +35,7 @@ steps: <<: *minio_environment commands: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc ls s3/$CACHE_BUCKET/desktop-build + - mc ls s3/$CACHE_BUCKET/desktop/python-cache/ - bash test/gui/woodpecker/script.sh check_python_cache - name: install-python-modules @@ -58,5 +58,5 @@ steps: - . ./.woodpecker.env - if $PYTHON_CACHE_FOUND; then exit 0; fi - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -r -a /woodpecker/desktop/python-cache*.tar.gz s3/$CACHE_BUCKET/desktop-build/ - - mc ls s3/$CACHE_BUCKET/desktop-build + - mc cp -r -a /woodpecker/desktop/python-cache*.tar.gz s3/$CACHE_BUCKET/desktop/python-cache/ + - mc ls s3/$CACHE_BUCKET/desktop/python-cache/ diff --git a/.woodpecker/purge-cache.yaml b/.woodpecker/purge-cache.yaml index 5a1ffb068..9b9cd3126 100644 --- a/.woodpecker/purge-cache.yaml +++ b/.woodpecker/purge-cache.yaml @@ -24,8 +24,11 @@ skip_clone: true matrix: include: - JOB_NAME: purge-desktop-build - PURGE_PATH: desktop-build/ + PURGE_PATH: desktop/bin-build/ TTL: 1d + - JOB_NAME: purge-python-cache + PURGE_PATH: desktop/python-cache/ + TTL: 14d - JOB_NAME: purge-browsers-cache PURGE_PATH: web/browsers-cache/ TTL: 14d @@ -33,7 +36,7 @@ matrix: PURGE_PATH: opencloud-build/ TTL: 1d - JOB_NAME: purge-logs - PURGE_PATH: desktop + PURGE_PATH: desktop/testlogs/ USE_PUBLIC_BUCKET: true TTL: 7d diff --git a/.woodpecker/ui-tests.yaml b/.woodpecker/ui-tests.yaml index 913eb5d8a..8a0ff7791 100644 --- a/.woodpecker/ui-tests.yaml +++ b/.woodpecker/ui-tests.yaml @@ -49,7 +49,7 @@ steps: commands: - requirements_sha=$(sha1sum test/gui/requirements.txt | cut -d" " -f1) - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -a s3/$CACHE_BUCKET/desktop-build/python-cache-$requirements_sha.tar.gz /woodpecker/desktop + - mc cp -a s3/$CACHE_BUCKET/desktop/python-cache/python-cache-$requirements_sha.tar.gz /woodpecker/desktop - name: install-python-modules image: *squish_image @@ -116,7 +116,7 @@ steps: <<: *minio_environment commands: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -a -r s3/$CACHE_BUCKET/desktop-build/${CI_COMMIT_SHA}/ /woodpecker/desktop/build + - mc cp -a -r s3/$CACHE_BUCKET/desktop/bin-build/${CI_COMMIT_SHA}/ /woodpecker/desktop/build - ls -lh /woodpecker/desktop/build/bin - name: create-extra-directories @@ -170,8 +170,8 @@ steps: <<: *minio_environment commands: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -a -r /woodpecker/desktop/test/gui/guiReportUpload s3/$PUBLIC_BUCKET/desktop/$CI_PIPELINE_NUMBER - - mc cp -a -r /woodpecker/desktop/test/gui/clientLog/* s3/$PUBLIC_BUCKET/desktop/$CI_PIPELINE_NUMBER/logs/ + - mc cp -a -r /woodpecker/desktop/test/gui/guiReportUpload s3/$PUBLIC_BUCKET/desktop/testlogs/$CI_PIPELINE_NUMBER + - mc cp -a -r /woodpecker/desktop/test/gui/clientLog/* s3/$PUBLIC_BUCKET/desktop/testlogs/$CI_PIPELINE_NUMBER/logs/ - name: gui-test-reports image: *minio_image @@ -193,5 +193,5 @@ steps: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - cd /woodpecker/desktop/test/gui/clientLog/ - echo "To download the logs, access the following links:" - - logs=$(mc find s3/$PUBLIC_BUCKET/desktop/$CI_PIPELINE_NUMBER/logs/) + - logs=$(mc find s3/$PUBLIC_BUCKET/desktop/testlogs/$CI_PIPELINE_NUMBER/logs/) - "for f in $logs; do echo \"$MC_HOST/$f \n \" | cut -d '/' -f1-3,5-99; done" diff --git a/test/gui/woodpecker/gui_test_reports.sh b/test/gui/woodpecker/gui_test_reports.sh index 4af7fbe98..e429ee2b1 100644 --- a/test/gui/woodpecker/gui_test_reports.sh +++ b/test/gui/woodpecker/gui_test_reports.sh @@ -1,6 +1,6 @@ #!/bin/bash -REPORT_PATH="$PUBLIC_BUCKET/desktop/$CI_PIPELINE_NUMBER/guiReportUpload" +REPORT_PATH="$PUBLIC_BUCKET/desktop/testlogs/$CI_PIPELINE_NUMBER/guiReportUpload" REPORT_URL="$MC_HOST/$REPORT_PATH" echo "" diff --git a/test/gui/woodpecker/script.sh b/test/gui/woodpecker/script.sh index fa191257d..1b7eaeb75 100644 --- a/test/gui/woodpecker/script.sh +++ b/test/gui/woodpecker/script.sh @@ -65,7 +65,7 @@ check_browsers_cache() { check_python_cache() { requirements_sha=$(sha1sum test/gui/requirements.txt | cut -d" " -f1) - python_cache=$(mc find s3/$CACHE_BUCKET/desktop-build/python-cache-$requirements_sha.tar.gz 2>&1 | grep 'Object does not exist') + python_cache=$(mc find s3/$CACHE_BUCKET/desktop/python-cache/python-cache-$requirements_sha.tar.gz 2>&1 | grep 'Object does not exist') if [[ "$python_cache" != "" ]] then From 3129a652384867094c2d46cc1ccd265fa189f69e Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Thu, 19 Feb 2026 10:38:46 +0545 Subject: [PATCH 2/3] ci: purge cache after executing test workflow Signed-off-by: Saw-jan --- .woodpecker/purge-cache.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.woodpecker/purge-cache.yaml b/.woodpecker/purge-cache.yaml index 9b9cd3126..4314b6938 100644 --- a/.woodpecker/purge-cache.yaml +++ b/.woodpecker/purge-cache.yaml @@ -19,6 +19,13 @@ when: - event: cron cron: nightly* +depends_on: + - ui-tests + +runs_on: + - success + - failure + skip_clone: true matrix: From 1ddc38e7104bca4e52eed7c2a5d8b229922d5744 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Fri, 20 Feb 2026 09:39:06 +0545 Subject: [PATCH 3/3] ci: rename client build cache dir Signed-off-by: Saw-jan --- .woodpecker/build.yaml | 4 ++-- .woodpecker/ui-tests.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index e65848470..3937ec92e 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -46,5 +46,5 @@ steps: <<: *minio_environment commands: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -a -r /woodpecker/desktop/build/bin s3/$CACHE_BUCKET/desktop/bin-build/${CI_COMMIT_SHA}/ - - mc ls --recursive s3/$CACHE_BUCKET/desktop/bin-build + - mc cp -a -r /woodpecker/desktop/build/bin s3/$CACHE_BUCKET/desktop/client-build/${CI_COMMIT_SHA}/ + - mc ls --recursive s3/$CACHE_BUCKET/desktop/client-build diff --git a/.woodpecker/ui-tests.yaml b/.woodpecker/ui-tests.yaml index 8a0ff7791..6c139ade2 100644 --- a/.woodpecker/ui-tests.yaml +++ b/.woodpecker/ui-tests.yaml @@ -116,7 +116,7 @@ steps: <<: *minio_environment commands: - mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY - - mc cp -a -r s3/$CACHE_BUCKET/desktop/bin-build/${CI_COMMIT_SHA}/ /woodpecker/desktop/build + - mc cp -a -r s3/$CACHE_BUCKET/desktop/client-build/${CI_COMMIT_SHA}/ /woodpecker/desktop/build - ls -lh /woodpecker/desktop/build/bin - name: create-extra-directories