[S] Change in osmo-ci[master]: scripts/osmocom-api-doxygen: check ssh early

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34203 ) Change subject: scripts/osmocom-api-doxygen: check ssh early ...................................................................... scripts/osmocom-api-doxygen: check ssh early Check for working SSH right at the start of the job, so we don't need to wait 2 minutes until it has built everything to find it out. Change-Id: Id93c15d38a49859dc63d39f70f051a7df871c398 --- M scripts/osmocom-api-doxygen.sh 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/osmocom-api-doxygen.sh b/scripts/osmocom-api-doxygen.sh index 765b7fb..cfa5e61 100755 --- a/scripts/osmocom-api-doxygen.sh +++ b/scripts/osmocom-api-doxygen.sh @@ -1,4 +1,6 @@ #!/bin/sh -ex +SSH_CMD="ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" + # Repositories for which doxygen documentation will be generated and # uploaded, also dependencies which need to be built repos_api=" @@ -13,6 +15,9 @@ # Source common.sh from osmo-ci.git for osmo_git_clone_url() . scripts/common.sh +# Check early that SSH works +$SSH_CMD api(a)ftp.osmocom.org -T -- true + # Put git repos and install data in a subdir, so it isn't in the root # of the cloned osmo-ci.git repository mkdir _osmocom_api @@ -45,7 +50,7 @@ rsync \ -avz \ --delete \ - -e "ssh -o UserKnownHostsFile=/build/contrib/known_hosts -p 48" \ + -e "$SSH_CMD" \ ./"$i"/doc/ \ api@ftp.osmocom.org:web-files/latest/"$i"/ done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34203 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id93c15d38a49859dc63d39f70f051a7df871c398 Gerrit-Change-Number: 34203 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged