From 7b0a20f02c4d12af7341a39285ab5e6bc9875b8a Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Tue, 16 Aug 2016 12:58:06 +0300 Subject: [PATCH] Add ansible ubuntu repo directly apt-add-repository exits true if key import fails More info, see LP#1613639 Change-Id: I52a1adc74a73890edd4ab0641d15789a92be4c2a --- utils/jenkins/kargo_deploy.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/jenkins/kargo_deploy.sh b/utils/jenkins/kargo_deploy.sh index 00634a0..6a4887b 100755 --- a/utils/jenkins/kargo_deploy.sh +++ b/utils/jenkins/kargo_deploy.sh @@ -160,7 +160,8 @@ if ! admin_node_command type ansible > /dev/null || \ ubuntu) with_retries admin_node_command -- sudo apt-get update with_retries admin_node_command -- sudo apt-get install -y software-properties-common - with_retries admin_node_command -- sudo apt-add-repository -y ppa:ansible/ansible + with_retries admin_node_command -- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv-keys 7BB9C367 + with_retries admin_node_command -- "sh -c \"sudo apt-add-repository -y 'deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main'\"" with_retries admin_node_command -- sudo apt-get update ;; debian)