aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-12-21 12:44:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-21 12:44:51 +0000
commit99a22171920a4af65063be2078a4f19b48bb724e (patch)
tree6455408c99decab7f2d241e52afa8580099cb965
parent3b218184c8ed7e6ba8c3de1336305963a8da69ba (diff)
parentde4b9fe37b0e7b5df67445e70edf56da2f5a4418 (diff)
Merge "deploy-cache: Fix bootstrap id_rsa inject" into stable/colorado
-rw-r--r--patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch b/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
index 79f74ac..80568a6 100644
--- a/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
+++ b/patches/opnfv-fuel/0056-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch
@@ -87,7 +87,7 @@ index 0000000..80cd0f4
++ if [ -f "${OPNFV_CACHE_PATH}/${OPNFV_CACHE_TAR}" -a \
++ -f "${OPNFV_CACHE_PATH}/id_rsa.pub" -a \
++ -f "${OPNFV_CACHE_PATH}/id_rsa" ]; then
-++ if cp "${OPNFV_CACHE_PATH}/id_rsa{,.pub}" "~/.ssh/" && \
+++ if cp "${OPNFV_CACHE_PATH}/id_rsa"* "/root/.ssh/" && \
++ fuel-bootstrap -v --debug import --activate \
++ "${OPNFV_CACHE_PATH}/${OPNFV_CACHE_TAR}" >>"$bs_build_log" 2>&1; then
++ fuel notify --topic "done" --send "${bs_cache_message}"