On Fri, Jan 29, 2021 at 09:33:56AM +0800, Xiao Shenwei wrote:
On Fri, Jan 29, 2021 at 09:27:29AM +0800, Liu Yinsi wrote:
Signed-off-by: Liu Yinsi liuyinsi@163.com
sparrow/0-package/common | 2 -- sparrow/0-package/install | 2 +- sparrow/install-tiny | 1 + 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 2d7c9e3..ccdc3f3 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,8 +2,6 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
-gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch
grep -q '^lkp:' /etc/passwd || useradd -u 1090 lkp grep -q '^mailer:' /etc/passwd || useradd -u 1144 mailer grep -q '^team:' /etc/group || groupadd team diff --git a/sparrow/0-package/install b/sparrow/0-package/install index 2b9a8f5..e01fc45 100755 --- a/sparrow/0-package/install +++ b/sparrow/0-package/install @@ -6,4 +6,4 @@ source /etc/os-release
. $(dirname ${BASH_SOURCE[0]})/os/${ID}
-. $(dirname ${BASH_SOURCE[0]})/common
why do this change,
Easy to call individually common script without internet
the script structure is change i have some script will call it, such as simplify-ci
OK.
Thanks, Yinsi
if necessary, pls change it also
Thanks, Shenwei
+gem install --no-user-install git activesupport rest-client cucumber json faye-websocket elasticsearch diff --git a/sparrow/install-tiny b/sparrow/install-tiny index a291549..cb47cf5 100755 --- a/sparrow/install-tiny +++ b/sparrow/install-tiny @@ -8,6 +8,7 @@ cd $CCI_SRC/sparrow || exit
0-package/install +0-package/common 1-storage/tiny 1-storage/permission 2-network/br0 -- 2.23.0