On Fri, Dec 18, 2020 at 06:45:38PM +0800, Wang Yong wrote:
[Why] config file in some software need storage and recall
now we can add config value in yaml and cp ${config} to ${cci_dir}/${benchmark}/ in PKGBUILD so that config file can be uploaded correctly
$ cat test.yaml ... config: ${config} ...
Signed-off-by: Wang Yong wangyong0117@qq.com
tests/build-pkg | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/tests/build-pkg b/tests/build-pkg index addff9f7b..0a143813f 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -5,6 +5,7 @@ # - git_tag # - pkg_ver # upstream_url +# - config
# We'll use the below global env vars, but not treat them as parameter to avoid # duplicates in result path like /openeuler-20.03-aarch64/openeuler-aarch64-cifs-2003/ @@ -20,6 +21,7 @@
. $LKP_SRC/lib/debug.sh . $LKP_SRC/distro/common +. $LKP_SRC/lib/http.sh
check_vars() { @@ -31,6 +33,29 @@ check_vars() [ -n "$os_mount" ] || die "os_mount is empty" }
+check_config_var() +{
- [ -n "$config" ] || return
+}
+get_config() +{
- local cci_http_host=${INITRD_HTTP_HOST}
- local cci_http_port=${INITRD_HTTP_PORT:-8800}
- export cci_dir=/cci/config
- local remote_dir="http://$%7Bcci_http_host%7D:$%7Bcci_http_port%7D$%7Bcci_dir%7D/$%7Bbenchmark..."
- mkdir -p ${cci_dir}
- check_config_var
- http_get_file "${remote_dir}/${config}" "${cci_dir}/${benchmark}/${config}"
+}
+upload_config() +{
- upload_to_target_dir "${cci_dir}/${benchmark}"
+}
mount_dest() { # the same image is mounted to cifs and nfs, the generated cgz files @@ -71,6 +96,13 @@ create_cgz_name()
[ -n "$git_tag" ] && { cgz_name="${cgz_path}/${git_tag}.cgz"
- # download PKGBUILD-$tag
- benchmark="${upstream_repo##*/}"
- export benchmark="${benchmark%.git}"
- [ -n "$PKGBUILD_TAG" ] && {
get_pkgfile "pkg/$benchmark" "PKGBUILD-$PKGBUILD_TAG"[ -f "PKGBUILD-$PKGBUILD_TAG" ] || die "PKGBUILD-$PKGBUILD_TAG not exist"[ -s "PKGBUILD-$PKGBUILD_TAG" ] || die "PKGBUILD-$PKGBUILD_TAG is empty"
Above codes is unnecessary, i have deleted them. For previous patch, i have add one fields of "git_tag".
Thanks, Liushaofei
[ -n "$pkg_ver" ] && { @@ -131,7 +163,11 @@ build_source_pkg() PACMAN=true BUILDDIR=$TMP CARCH=$os_arch PKGEXT=.cgz CGZDEST="$cgz_name" \ $LKP_SRC/sbin/makepkg ${pkg_args} --config $LKP_SRC/etc/makepkg.conf
- [ "$?" == 0 ] || exit 1
- local build_state="$?"
- upload_config
- [ "${build_state}" == "0" ] || exit 1 create_softlink upload_to_target_dir ${PKG_MNT}/${pack_to}/${pkgname}
} @@ -139,4 +175,5 @@ build_source_pkg() check_vars mount_dest request_pkg +get_config build_source_pkg -- 2.23.0