December 2020 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] git_mirror.rb: gitclone.com does not works well
by Li Yuanchao 16 Dec '20

16 Dec '20

First, repos clone from gitclone.com don't have all history commits, which would make some pkgbuild fail. Second, gitclone.com seems will refuse too frequent download, when use it in git_mirror, often failed. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 9f254f5..dee0285 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -34,8 +34,6 @@ class GitMirror def get_url(url) if url.include?('gitee.com/') && File.exist?("/srv/git/#{url.delete_prefix('https://')}") url = "/srv/git/#{url.delete_prefix('https://')}" - elsif url.include?('://github.com') - url = "https://gitclone.com/#{url.split('://')[1]}" end return url end -- 2.23.0

1 0

Re: [PATCH lkp-tests] pkg/: add PKGBUILD for AvxToNeon
by Zhang Yale 16 Dec '20

16 Dec '20

On Tue, Dec 15, 2020 at 05:17:21PM +0800, Li Ping wrote: >Signed-off-by: Li Ping <1477412247(a)qq.com> >--- > pkg/api-avx2neon/PKGBUILD | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > create mode 100644 pkg/api-avx2neon/PKGBUILD > >diff --git a/pkg/api-avx2neon/PKGBUILD b/pkg/api-avx2neon/PKGBUILD >new file mode 100644 >index 00000000..1451c01b >--- /dev/null >+++ b/pkg/api-avx2neon/PKGBUILD >@@ -0,0 +1,19 @@ >+pkgname=api-avx2neon >+pkgver=1 ^ May be pkgver is "git". Thanks, Yale >+pkgrel=0 >+arch=('i386' 'x86_64') >+url="https://github.com/kunpengcompute/AvxToNeon.git" >+license=('GPL') >+source=("https://github.com/kunpengcompute/AvxToNeon.git") >+md5sums=('SKIP') >+ >+build() { >+ cd "$srcdir/AvxToNeon/tests" >+ make >+} >+ >+package() { >+ benchmark_path="${pkgdir}/lkp/benchmarks/${pkgname}" >+ mkdir -p "${benchmark_path}" >+ cp -af "${srcdir}/AvxToNeon/"* "${benchmark_path}" >+} >-- >2.23.0 >

1 0

[PATCH v2 compass-ci 1/2] sbin/build-my-info.rb: building my_info from configuration files
by Liu Yinsi 16 Dec '20

16 Dec '20

before: users build info by input my_name, my_email, then write into ES and yaml file. after: no need users to input, get defaults admin account info from /etc/compass-ci/defaults/admin-account.yaml, then write into ES. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/build-my-info.rb | 54 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index 73f7390..d0cc7ec 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -3,48 +3,46 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true +require 'set' require 'json' require 'fileutils' require 'io/console' require_relative '../lib/es_client' - -print 'email: ' -my_email = $stdin.echo = gets.chomp -print 'name: ' -my_name = $stdin.echo = gets.chomp -my_uuid = %x(uuidgen).chomp - +require_relative '../container/defconfig' + +names = Set.new %w[ + my_email + my_name + my_token +] + +defaults = relevant_defaults(names) +my_email = defaults['my_email'] +my_name = defaults['my_name'] +my_token = defaults['my_token'] my_info = { 'my_email' => my_email, 'my_name' => my_name, - 'my_uuid' => my_uuid + 'my_token' => my_token, + 'my_login_name' => '', + 'my_commit_url' => '', + 'my_ssh_pubkey' => [] } -def store_account_info(my_info) - es = ESClient.new(index: 'accounts') - es.put_source_by_id(my_info['my_email'], my_info) +def es + ESClient.new(index: 'accounts') end -def config_default_yaml(my_info) - yaml_dir = "#{ENV['HOME']}/.config/compass-ci/defaults" - FileUtils.mkdir_p yaml_dir unless File.directory? yaml_dir - yaml_file = "#{yaml_dir}/account.yaml" - FileUtils.touch(yaml_file) unless File.exist? yaml_file - - yaml_info = YAML.load_file(yaml_file) || {} - yaml_info.update my_info +def store_account_info(my_info) + return if check_account_exist(my_info['my_email']) - File.open(yaml_file, 'w') do |f| - f.puts yaml_info.to_yaml - end + es.put_source_by_id(my_info['my_email'], my_info) end -def complete_my_info(my_info) - my_info['my_login_name'] = '' - my_info['my_commit_url'] = '' - my_info['my_ssh_pubkey'] = [] +def check_account_exist(email) + return true if es.query_by_id(email) + + return false end -config_default_yaml(my_info) -complete_my_info(my_info) store_account_info(my_info) -- 2.23.0

1 0

[PATCH v3 compass-ci] container/defconfig.rb: fix rubocop warning
by Liu Yinsi 16 Dec '20

16 Dec '20

W: Lint/UselessAssignment: Useless assignment to variable - kb. Use _ or _kb as a variable name to indicate that it won't be used. File.readlines('/proc/meminfo').map { |s| k, v, kb = s.split; { k.chomp(':') => v } } ^^ C: Style/Semicolon: Do not use semicolons to terminate expressions. File.readlines('/proc/meminfo').map { |s| k, v, kb = s.split; { k.chomp(':') => v } } ^ Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/defconfig.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/container/defconfig.rb b/container/defconfig.rb index 482dbc8..d1e2af0 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -35,11 +35,11 @@ def docker_rm(container) end def meminfo_hash - File.readlines('/proc/meminfo').map { |s| k, v, kb = s.split; { k.chomp(':') => v } } + YAML.load_file('/proc/meminfo') end def get_available_memory - memtotal = meminfo_hash[0]['MemTotal'].to_f / 1048576 + memtotal = meminfo_hash['MemTotal'].to_f / 1048576 # set container available memory size, minimum size is 1024m, maximum size is 30720m, # take the middle value according to the system memory size. -- 2.23.0

1 0

[PATCH lkp-tests 1/3] lib/job.rb: load configuration files
by Liu Yinsi 16 Dec '20

16 Dec '20

scheduler need to read administrator account configuration info, such as account autosubmit. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- lib/job.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/job.rb b/lib/job.rb index b41d55a7c..e6a96fd1f 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -427,6 +427,7 @@ class Job end Dir.glob(["/etc/compass-ci/defaults/*.yaml", + "/etc/compass-ci/account/*.yaml", "#{ENV['HOME']}/.config/compass-ci/defaults/*.yaml"]).each do |file| load_one_defaults(file, @job) end -- 2.23.0

2 4

[PATCH v2 compass-ci] docker-rootfs/packages-to-install: add ntpdate server
by Wang Chenglong 16 Dec '20

16 Dec '20

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/docker-rootfs/packages-to-install | 1 + 1 file changed, 1 insertion(+) diff --git a/container/docker-rootfs/packages-to-install b/container/docker-rootfs/packages-to-install index d7e890f..9098c27 100644 --- a/container/docker-rootfs/packages-to-install +++ b/container/docker-rootfs/packages-to-install @@ -1,3 +1,4 @@ kernel kernel-devel openssh-server +ntpdate -- 2.23.0

1 0

[PATCH compass-ci] container: add automatically start containers upon startup
by Bai Jing 16 Dec '20

16 Dec '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- container/conserver/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/conserver/start b/container/conserver/start index ae44291..e28ba4a 100755 --- a/container/conserver/start +++ b/container/conserver/start @@ -20,6 +20,7 @@ fi cmd=( docker run + --restart=always -d -e "IPMI_USER=${user}" -e "IPMI_PASSWORD=${passwd}" -- 2.23.0

1 0

[PATCH compass-ci] sparrow: add log for build/start every container
by Yu Chuan 16 Dec '20

16 Dec '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- sparrow/4-docker/buildall | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index a9269e03a550..8a3a23af3e4e 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -5,6 +5,8 @@ CONTAINER_PATH="$CCI_SRC/container" export action=$1 +[ -n "$LKP_SRC" ] && source "${LKP_SRC}/lib/log.sh" + build_depends() { local container=$1 @@ -23,6 +25,7 @@ do_one() local container=$1 local container_name=$(basename $container) lockfile-create -q --use-pid --retry 100 --lock-name "$container_name".lock + [ -n "$LKP_SRC" ] && log_info "start build $container" mkdir $tmpdir/$container_name 2>/dev/null && ( cd $container @@ -33,6 +36,7 @@ do_one() [ -x first-run ] && ./first-run [ -x start ] && ./start ) + [ -n "$LKP_SRC" ] && log_info "finish build $container." lockfile-remove --lock-name "$container_name".lock } -- 2.23.0

3 3

Re: [PATCH v2 lkp-tests] pkg: add PKGBUILD for AvxToNeon
by Zhang Yu 16 Dec '20

16 Dec '20

On Wed, Dec 16, 2020 at 10:34:50AM +0800, Li Ping wrote: >Signed-off-by: Li Ping <1477412247(a)qq.com> >--- > pkg/api-avx2neon/PKGBUILD | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > create mode 100644 pkg/api-avx2neon/PKGBUILD > >diff --git a/pkg/api-avx2neon/PKGBUILD b/pkg/api-avx2neon/PKGBUILD >new file mode 100644 >index 000000000..9706b3c5e >--- /dev/null >+++ b/pkg/api-avx2neon/PKGBUILD >@@ -0,0 +1,19 @@ >+pkgname=api-avx2neon >+pkgver=1 >+pkgrel=1 >+arch=('i386' 'x86_64') Can this PKGBUILD run in aarch64?? Thanks, Zhangyu >+url="https://github.com/kunpengcompute/AvxToNeon.git" >+license=('GPL') >+source=("https://github.com/kunpengcompute/AvxToNeon.git") >+md5sums=('SKIP') >+ >+build() { >+ cd "$srcdir/AvxToNeon/tests" >+ make >+} >+ >+package() { >+ benchmark_path="${pkgdir}/lkp/benchmarks/${pkgname}" >+ mkdir -p "${benchmark_path}" >+ cp -af "${srcdir}/AvxToNeon/"* "${benchmark_path}" >+} >-- >2.23.0 >

1 0

[PATCH lkp-tests] lkp-setup-rootfs: all use of env http_proxy and delete specific proxy settings
by Cui Yili 16 Dec '20

16 Dec '20

Signed-off-by: cuiyili <2268260388(a)qq.com> --- bin/lkp-setup-rootfs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs index cca1b53be..a7f1a7ffb 100755 --- a/bin/lkp-setup-rootfs +++ b/bin/lkp-setup-rootfs @@ -105,7 +105,6 @@ install_proxy_yum() { [ -d "/etc/yum/" ] || return - echo "proxy=http://$SQUID_HOST:$SQUID_PORT" >> /etc/yum.conf if ls /etc/yum.repos.d/*.repo >/dev/null 2>&1; then sed -i 's/https:/http:/g' /etc/yum.repos.d/*.repo fi @@ -117,11 +116,6 @@ install_proxy_apt() { [ -d "/etc/apt/" ] || return - cat << EOF > /etc/apt/apt.conf.d/proxy -Acquire::http::proxy "http://$SQUID_HOST:$SQUID_PORT/"; -Acquire::ftp::proxy "ftp://$SQUID_HOST:$SQUID_PORT/"; -EOF - for cfg in /etc/apt/sources.list /etc/apt/sources.list.d/* do [ -f "$cfg" ] || continue @@ -176,9 +170,6 @@ install_proxy() install_goproxy - [ -z "$SQUID_HOST" ] && return - [ -z "$SQUID_PORT" ] && return - install_proxy_apt || install_proxy_yum } -- 2.23.0

1 0