commit 77cbdce3e8883102bd1f6684aabf7b9acd7e082b parent 13c43e6e2f451df3f340ccbf3066523b5648e642 Author: Devan Carpenter <devan@taler.net> Date: Mon, 10 Feb 2025 11:23:30 +0100 ci: use ssh for head deployment Diffstat:
| M | contrib/ci/jobs/2-deploy-head/config.ini | | | 2 | +- |
| M | contrib/ci/jobs/2-deploy-head/job.sh | | | 20 | +++++++++++++++----- |
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/contrib/ci/jobs/2-deploy-head/config.ini b/contrib/ci/jobs/2-deploy-head/config.ini @@ -2,5 +2,5 @@ HALT_ON_FAILURE = True WARN_ON_FAILURE = True CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync +CONTAINER_NAME = docker.io/library/debian:bookworm-slim CONTAINER_ARCH = amd64 diff --git a/contrib/ci/jobs/2-deploy-head/job.sh b/contrib/ci/jobs/2-deploy-head/job.sh @@ -3,14 +3,24 @@ set -exuo pipefail ARTIFACT_PATH="/artifacts/sandcastle-ng/${CI_COMMIT_REF}/*.tar" -RSYNC_HOST="taler.host.internal" -RSYNC_PORT=424240 +RSYNC_HOST="firefly.gnunet.org" +RSYNC_PORT=22 RSYNC_PATH="incoming" -RSYNC_DEST="rsync://${RSYNC_HOST}/${RSYNC_PATH}" +RSYNC_USER="taler-head" +RSYNC_DEST="${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_PATH}" +# Useful to print for debug +ls -alh $(dirname ${ARTIFACT_PATH}) +## We need ssh and rsync +apt-get update -yqq +apt-get install -yqq --no-install-recommends \ + ssh-client rsync + +# Send our container tarball to the host rsync -vP \ --port ${RSYNC_PORT} \ - ${ARTIFACT_PATH} ${RSYNC_DEST} || rm -f "${ARTIFACT_PATH}" + ${ARTIFACT_PATH} ${RSYNC_DEST} || rm -f ${ARTIFACT_PATH} -rm -f "${ARTIFACT_PATH}" +# Make sure we cleanup +rm -f ${ARTIFACT_PATH}