diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2024-02-01 15:51:05 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2024-02-02 09:16:47 +0100 |
| commit | 737907fe0c4cd7ae74cba3e13ed858d4fb32cb1a (patch) | |
| tree | c0bddbce4e16de1257975f5e6d65e3852d8b90fd | |
| parent | 41ae81a87c296ae39a4292c0ac05ce8e5d36ca85 (diff) | |
| download | mullvadvpn-737907fe0c4cd7ae74cba3e13ed858d4fb32cb1a.tar.xz mullvadvpn-737907fe0c4cd7ae74cba3e13ed858d4fb32cb1a.zip | |
Update buildserver-upload.sh to use configurable server domains
| -rw-r--r-- | ci/buildserver-config.sh | 8 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 5 | ||||
| -rwxr-xr-x | ci/publish-linux-repositories.sh | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/ci/buildserver-config.sh b/ci/buildserver-config.sh index b2c11a0371..82668c640e 100644 --- a/ci/buildserver-config.sh +++ b/ci/buildserver-config.sh @@ -18,10 +18,10 @@ export SUPPORTED_DEB_CODENAMES export SUPPORTED_RPM_ARCHITECTURES=("x86_64" "aarch64") -# Servers to upload Linux deb/rpm repositories to -export DEV_LINUX_REPOSITORY_SERVERS=("cdn.devmole.eu") -export STAGING_LINUX_REPOSITORY_SERVERS=("cdn.stagemole.eu") -export PRODUCTION_LINUX_REPOSITORY_SERVERS=("cdn.mullvad.net") +# Servers to upload Linux deb/rpm repositories and all other build artifacts to. +export DEV_UPLOAD_SERVERS=("cdn.devmole.eu") +export STAGING_UPLOAD_SERVERS=("cdn.stagemole.eu") +export PRODUCTION_UPLOAD_SERVERS=("cdn.mullvad.net") export DEV_LINUX_REPOSITORY_PUBLIC_URL="https://repository.devmole.eu" export STAGING_LINUX_REPOSITORY_PUBLIC_URL="https://repository.stagemole.eu" diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index 906328262f..0a585d5e9c 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -14,7 +14,10 @@ cd "$UPLOAD_DIR" function rsync_upload { local file=$1 local upload_dir=$2 - rsync -av --mkpath --rsh='ssh -p 1122' "$file" "upload-server-1:$upload_dir/" + for server in "${PRODUCTION_UPLOAD_SERVERS[@]}"; do + echo "Uploading $file to $server:$upload_dir" + rsync -av --mkpath --rsh='ssh -p 1122' "$file" "$server:$upload_dir/" + done } while true; do diff --git a/ci/publish-linux-repositories.sh b/ci/publish-linux-repositories.sh index e2b0dec2ad..bca8451834 100755 --- a/ci/publish-linux-repositories.sh +++ b/ci/publish-linux-repositories.sh @@ -14,15 +14,15 @@ source "$SCRIPT_DIR/buildserver-config.sh" while [ "$#" -gt 0 ]; do case "$1" in "--production") - repository_servers=("${PRODUCTION_LINUX_REPOSITORY_SERVERS[@]}") + repository_servers=("${PRODUCTION_UPLOAD_SERVERS[@]}") repository_server_url="$PRODUCTION_LINUX_REPOSITORY_PUBLIC_URL" ;; "--staging") - repository_servers=("${STAGING_LINUX_REPOSITORY_SERVERS[@]}") + repository_servers=("${STAGING_UPLOAD_SERVERS[@]}") repository_server_url="$STAGING_LINUX_REPOSITORY_PUBLIC_URL" ;; "--dev") - repository_servers=("${DEV_LINUX_REPOSITORY_SERVERS[@]}") + repository_servers=("${DEV_UPLOAD_SERVERS[@]}") repository_server_url="$DEV_LINUX_REPOSITORY_PUBLIC_URL" ;; "--deb") |