Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .woodpecker/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/client-build/${CI_COMMIT_SHA}/
- mc ls --recursive s3/$CACHE_BUCKET/desktop/client-build
6 changes: 3 additions & 3 deletions .woodpecker/cache-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
14 changes: 12 additions & 2 deletions .woodpecker/purge-cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,31 @@ when:
- event: cron
cron: nightly*

depends_on:
- ui-tests

runs_on:
- success
- failure

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
- JOB_NAME: purge-opencloud
PURGE_PATH: opencloud-build/
TTL: 1d
- JOB_NAME: purge-logs
PURGE_PATH: desktop
PURGE_PATH: desktop/testlogs/
USE_PUBLIC_BUCKET: true
TTL: 7d

Expand Down
10 changes: 5 additions & 5 deletions .woodpecker/ui-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/client-build/${CI_COMMIT_SHA}/ /woodpecker/desktop/build
- ls -lh /woodpecker/desktop/build/bin

- name: create-extra-directories
Expand Down Expand Up @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion test/gui/woodpecker/gui_test_reports.sh
Original file line number Diff line number Diff line change
@@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion test/gui/woodpecker/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down