[PATCH compass-ci] sparrow: set default value $CCI_SRC
if $CCI_SRC is null, can't find check_public_network.sh script. Signed-off-by: Liu Yinsi <liuyinsi@163.com> --- sparrow/0-package/common | 2 ++ sparrow/0-package/os/openEuler | 2 ++ sparrow/5-build/os-ready | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index eb86b242..82c09ff5 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh public_network_ok && { diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 8cdadd52..5829a123 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh pkgs=( diff --git a/sparrow/5-build/os-ready b/sparrow/5-build/os-ready index 5e1acc48..91323379 100755 --- a/sparrow/5-build/os-ready +++ b/sparrow/5-build/os-ready @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh public_network_ok && $CCI_SRC/sbin/download-rootfs -- 2.23.0
Reviewed-by: Luan Shengde <shdluan@163.com> On Sun, Apr 25, 2021 at 06:57:27PM +0800, Liu Yinsi wrote:
if $CCI_SRC is null, can't find check_public_network.sh script.
Signed-off-by: Liu Yinsi <liuyinsi@163.com> --- sparrow/0-package/common | 2 ++ sparrow/0-package/os/openEuler | 2 ++ sparrow/5-build/os-ready | 2 ++ 3 files changed, 6 insertions(+)
diff --git a/sparrow/0-package/common b/sparrow/0-package/common index eb86b242..82c09ff5 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh
public_network_ok && { diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 8cdadd52..5829a123 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh
pkgs=( diff --git a/sparrow/5-build/os-ready b/sparrow/5-build/os-ready index 5e1acc48..91323379 100755 --- a/sparrow/5-build/os-ready +++ b/sparrow/5-build/os-ready @@ -2,6 +2,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci + . $CCI_SRC/lib/check_public_network.sh
public_network_ok && $CCI_SRC/sbin/download-rootfs -- 2.23.0
participants (2)
-
Liu Yinsi -
Luan Shengde