From: zhihui wu <wu.zhihui1@zte.com.cn>
Date: Wed, 19 Jul 2017 14:26:28 +0000 (+0800)
Subject: [bugfix]invalid user ‘jenkins’
X-Git-Tag: opnfv-5.0.RC1~167
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5c3b0e9a51e3486ae660685a3c33aed0e39c5ab2;p=fuel.git

[bugfix]invalid user ‘jenkins’

See https://build.opnfv.org/ci/job/fuel-deploy-zte-pod1-daily-master/456/console
In lib.sh, generate_ssh_key() assumes that "jenkins" is
the current user name. But on zte-pod1, the ci user name
isn't jenkins. It is better to use $USER replaced "jenkins".

JIRA:FUEL-273


Change-Id: I6ec6847eccd055b8b4062dd202f8f0a24ba6dd73
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
---

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 679b997b7..1848c7008 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -4,7 +4,7 @@
 
 generate_ssh_key() {
   [ -f "$SSH_KEY" ] || ssh-keygen -f ${SSH_KEY} -N ''
-  install -o jenkins -m 0600 ${SSH_KEY} /tmp/
+  install -o $USER -m 0600 ${SSH_KEY} /tmp/
 }
 
 get_base_image() {