allow non-rsync

8 files changed, 96 insertions, 56 deletions

diff --git a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh
index 07299f2f4..bc77ef954 100755
--- a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh
+++ b/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/bookworm-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/bookworm-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh b/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh
index 07299f2f4..bc77ef954 100755
--- a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh
+++ b/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/bookworm-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/bookworm-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh b/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh
index d4d2c3882..4793d5bb1 100755
--- a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh
+++ b/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/trixie-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/trixie-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh b/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh
index d4d2c3882..4793d5bb1 100755
--- a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh
+++ b/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/trixie-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/trixie-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh b/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh
index 05644cc2e..ac6c27e56 100755
--- a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh
+++ b/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/unstable-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/unstable-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh b/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh
index 05644cc2e..ac6c27e56 100755
--- a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh
+++ b/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/unstable-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/unstable-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh
index 05644cc2e..ac6c27e56 100755
--- a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh
+++ b/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/unstable-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/unstable-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/targets/debian/deploy-package/job.sh b/contrib/ci/targets/debian/deploy-package/job.sh
index 07299f2f4..bc77ef954 100755
--- a/contrib/ci/targets/debian/deploy-package/job.sh
+++ b/contrib/ci/targets/debian/deploy-package/job.sh
@@ -2,12 +2,17 @@
 set -exuo pipefail
 
 ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname $0)/../../../../release-artifacts"}"
 
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/bookworm-taler-ci/"
-RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/bookworm-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
 
-rsync -vP \
-  --port ${RSYNC_PORT} \
-  ${ARTIFACT_PATH} ${RSYNC_DEST}
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;