From 40cee28bd58a5e7cbae4544f53aeba9dc84fcf61 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 10 May 2020 00:12:25 +0100 Subject: [PATCH] gitlab-ci: more fixes to deploy --- .gitlab-ci.yml | 3 +++ hack/deploy.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aa214327d..6c5108d9e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,12 +20,15 @@ nixCache: ixvm-fra01: extends: .deploy + resource_group: ixvm-fra01 script: './hack/deploy.sh "141.98.136.124" ""' marukuru: extends: .deploy + resource_group: marukuru script: './hack/deploy.sh "103.105.48.15" "-p 20022"' clouvider-fra01: extends: .deploy + resource_group: clouvider-fra01 script: './hack/deploy.sh "193.228.196.57" ""' diff --git a/hack/deploy.sh b/hack/deploy.sh index 3ee67004e7..12f84b67cd 100755 --- a/hack/deploy.sh +++ b/hack/deploy.sh @@ -10,7 +10,9 @@ while read -r manifest_line; do cp "${!manifest_bits[0]}" "${manifest_bits[1]}" done < "$SECRETS_MANIFEST" -if [ -z ${2+x} ]; then ssh_cmd="ssh"; else ssh_cmd="ssh $2"; fi +ssh_cmd="ssh -o StrictHostKeyChecking=accept-new" + +if [ ! -z ${2+x} ]; then ssh_cmd="$ssh_cmd $2"; fi echo Syncing repo content to machine "$1" rsync -e "$ssh_cmd" -avz --exclude='.hg/' ./ "deployer@$1:depot/"