From 3ac03b0cff065cfc6db069052fcd1daf62bd4021 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Sat, 20 Oct 2018 11:51:54 +0100
Subject: [PATCH] CI: Just discovered ssh-keyscan - no need to copy in
known_hosts file. Also removed conda stuff from setup_ssh.sh
---
.ci/setup_ssh.sh | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/.ci/setup_ssh.sh b/.ci/setup_ssh.sh
index e42264cd3..40c0c5c1e 100644
--- a/.ci/setup_ssh.sh
+++ b/.ci/setup_ssh.sh
@@ -31,9 +31,7 @@ if [[ -f /.dockerenv ]]; then
echo "$SSH_PRIVATE_KEY_FSL_DOWNLOAD" > $HOME/.ssh/id_fsl_download;
if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
- echo "$SSH_PRIVATE_KEY_DOC_DEPLOY" > $HOME/.ssh/id_doc_deploy;
- echo "$SSH_PRIVATE_KEY_CONDA_DEPLOY" > $HOME/.ssh/id_conda_deploy;
- echo "$SSH_PRIVATE_KEY_CONDA_INDEX" > $HOME/.ssh/id_conda_index;
+ echo "$SSH_PRIVATE_KEY_DOC_DEPLOY" > $HOME/.ssh/id_doc_deploy;
fi;
chmod go-rwx $HOME/.ssh/id_*;
@@ -43,10 +41,11 @@ if [[ -f /.dockerenv ]]; then
if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
ssh-add $HOME/.ssh/id_doc_deploy;
- ssh-add $HOME/.ssh/id_conda_deploy;
fi
- echo "$SSH_SERVER_HOSTKEYS" > $HOME/.ssh/known_hosts;
+ ssh-keyscan ${UPSTREAM_URL##*@} >> $HOME/.ssh/known_hosts;
+ ssh-keyscan ${DOC_HOST##*@} >> $HOME/.ssh/known_hosts;
+ ssh-keyscan ${FSL_HOST##*@} >> $HOME/.ssh/known_hosts;
touch $HOME/.ssh/config;
@@ -59,16 +58,6 @@ if [[ -f /.dockerenv ]]; then
echo " User ${DOC_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_doc_deploy" >> $HOME/.ssh/config;
- echo "Host condadeploy" >> $HOME/.ssh/config;
- echo " HostName ${CONDA_HOST##*@}" >> $HOME/.ssh/config;
- echo " User ${CONDA_HOST%@*}" >> $HOME/.ssh/config;
- echo " IdentityFile $HOME/.ssh/id_conda_deploy" >> $HOME/.ssh/config;
-
- echo "Host condaindex" >> $HOME/.ssh/config;
- echo " HostName ${CONDA_HOST##*@}" >> $HOME/.ssh/config;
- echo " User ${CONDA_HOST%@*}" >> $HOME/.ssh/config;
- echo " IdentityFile $HOME/.ssh/id_conda_index" >> $HOME/.ssh/config;
-
echo "Host fsldownload" >> $HOME/.ssh/config;
echo " HostName ${FSL_HOST##*@}" >> $HOME/.ssh/config;
echo " User ${FSL_HOST%@*}" >> $HOME/.ssh/config;
--
GitLab