mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-13 07:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213 from flatcar-linux/t-lo/ci-fix-nightly-binpkg-url

Browse Source 
settings / ci-automation: remove "binpkg" prefix
This commit is contained in:
Thilo Fromm 2022-01-11 11:25:53 +01:00 committed by GitHub
commit e84e90e625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci-automation/garbage_collect.sh
View File

@ -89,7 +89,7 @@ function garbage_collect() {
else else
echo "## ${version} is an OS image version. ##" echo "## ${version} is an OS image version. ##"
rmpat="${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-packages-*" rmpat="${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-packages-*"
rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/binpkgs/boards/*/${os_vernum}/" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/boards/*/${os_vernum}/"
rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-images-*" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-images-*"
rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/images/*/${os_vernum}/" rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/images/*/${os_vernum}/"
fi fi

4
ci-automation/push_pkgs.sh
View File

@ -27,7 +27,7 @@
# #
# OUTPUT: # OUTPUT:
# #
# 1. Binary packages published to buildcache at "binpkgs/boards/[ARCH]-usr/[VERSION]/pkgs". # 1. Binary packages published to buildcache at "boards/[ARCH]-usr/[VERSION]/pkgs".
# 2. "./ci-cleanup.sh" with commands to clean up temporary build resources, # 2. "./ci-cleanup.sh" with commands to clean up temporary build resources,
# to be run after this step finishes / when this step is aborted. # to be run after this step finishes / when this step is aborted.
@ -41,7 +41,7 @@ function image_build__copy_to_bincache() {
source ci-automation/ci_automation_common.sh source ci-automation/ci_automation_common.sh
cd /build/$arch-usr/var/lib/portage/pkgs/ cd /build/$arch-usr/var/lib/portage/pkgs/
copy_to_buildcache "binpkgs/boards/$arch-usr/$version/pkgs" * copy_to_buildcache "boards/$arch-usr/$version/pkgs" *
} }
# -- # --

2
settings.env
View File

@ -5,4 +5,4 @@ SETTING_BINPKG_SERVER_PROD="https://mirror.release.flatcar-linux.net"
# development servers / bin caches. # development servers / bin caches.
SETTING_BINPKG_SERVER_DEV="https://bucket.release.flatcar-linux.net/flatcar-jenkins" SETTING_BINPKG_SERVER_DEV="https://bucket.release.flatcar-linux.net/flatcar-jenkins"
SETTING_BINPKG_SERVER_DEV_CONTAINERISED="https://bincache.flatcar-linux.net/binpkgs" SETTING_BINPKG_SERVER_DEV_CONTAINERISED="https://bincache.flatcar-linux.net"