On Fri, Jan 08, 2021 at 10:53:56AM +0800, Hu Xuejiao wrote:

Signed-off-by: Hu XueJiao 1034502035@qq.com

sparrow/3-code/git | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/sparrow/3-code/git b/sparrow/3-code/git index 48741ec..6174916 100755 --- a/sparrow/3-code/git +++ b/sparrow/3-code/git @@ -5,31 +5,21 @@ # fix files permissions cause container service start failed umask 002

-# download git trees

-cd /c || exit

-# git clone https://gitee.com/openeuler/compass-ci.git -# modify and manual run for now: -[ -d "compass-ci/.git" ] || {

• git clone https://gitee.com/wu_fengguang/compass-ci.git
• cd /c/compass-ci || exit
• [ -n "$compass_commit_id" ] && git reset --hard "$compass_commit_id"
• ln -s compass-ci /c/cci

+download_repo() +{

• local repo="$1"
• local commit_id="$2"
• [ -d "/c/$repo/.git" ] || {

• git clone https://gitee.com/wu_fengguang/"$repo".git /c/"$repo"
  

• [ "$repo" == "compass-ci" ] && ln -s /c/"$repo" /c/cci
  

• }
• cd /c/"$repo" || exit
• [ -n "$commit_id" ] && git reset --hard "$commit_id"

}

-[ -d "lkp-tests/.git" ] || {

• git clone https://gitee.com/wu_fengguang/lkp-tests.git
• cd /c/lkp-tests || exit
• [ -n "$lkp_commit_id" ] && git reset --hard "$lkp_commit_id"

-}

-[ -d "upstream-repos/.git" ] || {

• git clone https://gitee.com/wu_fengguang/upstream-repos.git
• cd /c/upstream-repos || exit
• [ -n "$upstream_commit_id" ] && git reset --hard "$upstream_commit_id"

-} +download_repo "compass-ci" "compass_commit_id"

^------ compass_commit_id => "$compass_commit_id" ? Thanks, Liushaofei

+download_repo "lkp-tests" "$lkp_commit_id"

+download_repo "upstream-repos" "$upstream_commit_id"

2.23.0