diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3d9b11c..0e0a3419 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ stages: - ls -lh images - chmod +x ./tools/upload.sh - ./tools/upload.sh - - find ./images/ -type f | awk -F '/' '{print $NF}' > /tmp/has-built-files.txt + - find ./images/ -type f | grep x86_64_COTS | grep -v APP-BUNDLE | awk -F '/' '{print $NF}' > /tmp/has-built-files.txt - rm -rf images/* - mv /tmp/has-built-files.txt ./images tags: diff --git a/tools/notify-jobs-done.sh b/tools/notify-jobs-done.sh index e5c1df80..8230f1fd 100644 --- a/tools/notify-jobs-done.sh +++ b/tools/notify-jobs-done.sh @@ -39,7 +39,7 @@ build_notify_content() bj_download_urls=$(build_download_urls https repo.geedge.net $aliyun_url_subpath $has_built_files) de_download_urls=$(build_download_urls https de.repo.gdnt-cloud.com $aliyun_url_subpath $has_built_files) sg_download_urls=$(build_download_urls https sg.repo.gdnt-cloud.com $aliyun_url_subpath $has_built_files) - bj_office_download_urls=$(build_download_urls http 192.168.44.24 $bj_office_url_subpath $has_built_files) + bj_office_download_urls=$(build_download_urls ftp 192.168.44.24 $bj_office_url_subpath $has_built_files) title_content="$tsg_os_version has been built. You can download it from the nearest mirror site.\n" bj_content="Beijing:\n$bj_download_urls"