mirror of https://gerrit.osmocom.org/osmo-ci
jobs/master-builds: pass ssh agent sock to docker
Pass the ssh agent to docker for master builds, so we can publish manuals and other files generated during the builds. This used to work with the .ssh directory where each lxc had its own key. But we are changing that to have the keys in jenkins and use the ssh agent, so it works without additional configuration when adding new nodes/lxcs (such as the two deb11 lxcs we just added). Change-Id: I6dc1fd5d7e81ec135f805562608f06cf03a1baeb
This commit is contained in:
parent
ffd4e39873
commit
40ced5a1a0
|
@ -36,15 +36,16 @@
|
|||
-e OSMO_GSM_MANUALS_DIR="/opt/osmo-gsm-manuals" \
|
||||
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
|
||||
-e PUBLISH="1" \
|
||||
-e SSH_AUTH_SOCK=/ssh-agent \
|
||||
-e WITH_MANUALS="1" \
|
||||
-w /build -i -u build \
|
||||
-v $(readlink -f $SSH_AUTH_SOCK):/ssh-agent \
|
||||
-v "$PWD:/build" \
|
||||
-v "$ARTIFACT_STORE:/artifact_store" \
|
||||
-v "$HOME/.ssh:/home/build/.ssh:ro" \
|
||||
docker_img: '$USER/debian-buster-jenkins'
|
||||
timeout_cmd: '/usr/bin/timeout 30m'
|
||||
cmd: '{docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh'
|
||||
wrappers: []
|
||||
trigger:
|
||||
email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org
|
||||
git_base_url: https://gerrit.osmocom.org
|
||||
|
@ -531,6 +532,9 @@
|
|||
- email:
|
||||
recipients: '{obj:email}'
|
||||
send-to-individuals: true
|
||||
wrappers: '{obj:wrappers}'
|
||||
wrappers:
|
||||
- ssh-agent-credentials:
|
||||
users:
|
||||
- 97634b9d-a867-4f6d-825d-1da99813e93d
|
||||
|
||||
# vim: expandtab tabstop=2 shiftwidth=2
|
||||
|
|
Loading…
Reference in New Issue