From 571bd45783f6b92e36d38e927860097379b31e2a Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Fri, 19 Jul 2024 14:40:31 -0500 Subject: [PATCH] Added --delete option to rsync push to repo server The rsync push successfully put the new repo files on the repo server, but also left the original files in place which caused old packages and repo errata to build up over time. Adding the --delete switch results removal of files on the repo server that were deleted as part of the the distribution scripts "Clean and reset the workspaces" section. --- scripts/cicd/build-orchestration/distribute-nightly-packages.sh | 2 +- scripts/cicd/build-orchestration/distribute-stable-packages.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cicd/build-orchestration/distribute-nightly-packages.sh b/scripts/cicd/build-orchestration/distribute-nightly-packages.sh index 68a72f69..bd902e87 100644 --- a/scripts/cicd/build-orchestration/distribute-nightly-packages.sh +++ b/scripts/cicd/build-orchestration/distribute-nightly-packages.sh @@ -58,7 +58,7 @@ gpgkey=https://packages.veilid.net/gpg/veilid-packages-key.public" > $HOME/srv/r # Tar the repo data and transfer to the repo server echo "Moving the repo scaffold to the repo server" cd $HOME -rsync --archive $HOME/srv/* gitlab-runner@10.116.0.3:/srv +rsync --archive --delete $HOME/srv/* gitlab-runner@10.116.0.3:/srv # Cleanup echo "Cleaning up the workspace" diff --git a/scripts/cicd/build-orchestration/distribute-stable-packages.sh b/scripts/cicd/build-orchestration/distribute-stable-packages.sh index ea5fddc8..4998bdb3 100644 --- a/scripts/cicd/build-orchestration/distribute-stable-packages.sh +++ b/scripts/cicd/build-orchestration/distribute-stable-packages.sh @@ -67,7 +67,7 @@ gpgkey=https://packages.veilid.net/gpg/veilid-packages-key.public" > $HOME/srv/r # Tar the repo data and transfer to the repo server echo "Moving the repo scaffold to the repo server" cd $HOME -rsync --archive $HOME/srv/* gitlab-runner@10.116.0.3:/srv +rsync --archive --delete $HOME/srv/* gitlab-runner@10.116.0.3:/srv # Cleanup echo "Cleaning up the workspace"