From 96f25bf5195213bef9c4f45da462dbb1562f4e29 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 30 Nov 2022 12:32:33 +0100 Subject: [PATCH] jobs/master-builds: use binaries ssh credentials Allow overriding the ssh agent credentials per repository, and use binaries_ftp.osmocom.org where needed. Use docs_ftp.osmocom.org instead of 97634b9d-a867-4f6d-825d-1da99813e93d so it's clear what the key is for. I generated a new one with the new ID. Fixes: OS#5798 Change-Id: I821968e09aaac3f6f6178de33fc909f81cb4abcb --- jobs/master-builds.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 17f576bf..6a1ec09f 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -49,6 +49,8 @@ trigger: email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org git_base_url: https://gerrit.osmocom.org + ssh: + - docs_ftp.osmocom.org # in alphabetical order repos: @@ -260,6 +262,9 @@ docker_img: 'registry.osmocom.org/$USER/fpga-build' cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org kredon@sysmocom.de 246tnt@gmail.com + ssh: + - binaries_ftp.osmocom.org + - docs_ftp.osmocom.org - osmo-fl2k: git_base_url: https://gitea.osmocom.org/sdr @@ -390,6 +395,9 @@ - osmo-asf4-dfu: cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org ewild@sysmocom.de + ssh: + - binaries_ftp.osmocom.org + - docs_ftp.osmocom.org - osmo-ccid-firmware: cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org ewild@sysmocom.de @@ -401,6 +409,9 @@ docker_img: '$USER/debian-bullseye-jenkins' cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org kredon@sysmocom.de + ssh: + - binaries_ftp.osmocom.org + - docs_ftp.osmocom.org - osmo-e1d - osmo-cbc @@ -533,7 +544,6 @@ send-to-individuals: true wrappers: - ssh-agent-credentials: - users: - - 97634b9d-a867-4f6d-825d-1da99813e93d + users: '{obj:ssh}' # vim: expandtab tabstop=2 shiftwidth=2