From 59b095b6688e8b628ede44c282f8699bd21e4c83 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 25 Jan 2017 03:08:15 +0100 Subject: deploy-cache: Fix typo in nailgun settings sed Previous commit missed adding the "-i" flag to a sed call, rendering the whole effort useless. JIRA: ARMBAND-190 Change-Id: If0724cb99c94530e5eeb140e93759c4a19503908 Signed-off-by: Alexandru Avadanii --- .../0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch index ae580922..2076dfbb 100644 --- a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch +++ b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch @@ -90,7 +90,7 @@ index 0000000..71eae61 ++ if cp "${OPNFV_CACHE_PATH}/id_rsa"* "/root/.ssh/" && \ ++ cp "/root/.ssh/id_rsa.pub" "/root/.ssh/authorized_keys" && \ ++ cp "/root/.ssh/id_rsa.pub" "/etc/cobbler/authorized_keys" && \ -++ sed "s|\"ssh-rsa .*\"|\"$(cat /root/.ssh/id_rsa.pub)\"|g" \ +++ sed -i -e "s|\"ssh-rsa .*\"|\"$(cat /root/.ssh/id_rsa.pub)\"|g" \ ++ /etc/nailgun/settings.yaml && \ ++ fuel-bootstrap -v --debug import --activate \ ++ "${OPNFV_CACHE_PATH}/${OPNFV_CACHE_TAR}" >>"$bs_build_log" 2>&1; then -- cgit 1.2.3-korg