- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] addsoftware: clean the runtime dir after modifying nfsroot
by Xu Xijian 06 Jan '21

06 Jan '21

When install a software into a nfsroot, some unwanted files will be added into runtime dir, so rm them to keep nfsroot clean. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/add-software/run | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/container/add-software/run b/container/add-software/run index 62d4eff..60e5e07 100755 --- a/container/add-software/run +++ b/container/add-software/run @@ -40,7 +40,11 @@ install_cmds=( --rm -v "$rootdir":/mnt/root addsoftware:auto - yum install -y --skip-broken --installroot=/mnt/root $packages + bash -c " + yum install -y --skip-broken --installroot=/mnt/root $packages + cd /mnt/root + rm -rf srv/* opt/* mnt/* media/* home/* lost+found/* dev/* proc/* run/* sys/* + " ) echo "rsync rootfs from $basever to $newver..." -- 2.23.0

1 0

[PATCH compass-ci 3/3] providers/docker: copy rootfs/addon/root/* to container
by Xiao Shenwei 06 Jan '21

06 Jan '21

Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/docker/sbin/entrypoint.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 providers/docker/sbin/entrypoint.sh diff --git a/providers/docker/sbin/entrypoint.sh b/providers/docker/sbin/entrypoint.sh new file mode 100755 index 0000000..9848b4f --- /dev/null +++ b/providers/docker/sbin/entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +cp -r /lkp/lkp/src/rootfs/addon/root/. /root +cp -r /lkp/lkp/src/rootfs/addon/usr/* /usr +sh /lkp/lkp/src/rootfs/addon/etc/init.d/lkp-bootstrap -- 2.23.0

1 0

[PATCH compass-ci 1/3] providers/docker: change the file path of entrypoint.sh
by Xiao Shenwei 06 Jan '21

06 Jan '21

[why] /root/bin the dir may be used by user to stores own file Thanks, Shenwei --- providers/docker/run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/providers/docker/run.sh b/providers/docker/run.sh index 62a1f9f..d39b6cf 100755 --- a/providers/docker/run.sh +++ b/providers/docker/run.sh @@ -23,17 +23,18 @@ cmd=( docker run --rm -m $memory + --hostname $host --tmpfs /tmp:rw,exec,nosuid,nodev -e CCI_SRC=/c/compass-ci -v ${load_path}/lkp:/lkp - -v ${DIR}/bin:/root/bin:ro + -v ${DIR}/sbin:/root/sbin:ro -v $CCI_SRC:/c/compass-ci:ro -v /srv/git:/srv/git:ro -v /srv/result:/srv/result:ro -v ${busybox_path}:/usr/local/bin/busybox --oom-score-adj="-1000" ${docker_image} - /root/bin/entrypoint.sh + /root/sbin/entrypoint.sh ) "${cmd[@]}" -- 2.23.0

1 0

[PATCH lkp-tests] lib/job.rb: fix check key
by Wei Jihui 06 Jan '21

06 Jan '21

first check key starts with "#!", then check key matchs /^\w.*\|.*\w$/ Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/job.rb b/lib/job.rb index 35e0ceee..8346db87 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -288,7 +288,6 @@ class Job def multi_args(hash) jobs_array = [] hash.each { |key, value| - next unless key =~ /^\w.*\|.*\w$/ next unless key.is_a?(String) if key.start_with?('#! ') @@ -296,6 +295,8 @@ class Job next end + next unless key =~ /^\w.*\|.*\w$/ + key_array = key.split('|').map(&:strip) [value].flatten.each do |v| next unless v =~ /^\w.*\|.*\w$/ -- 2.23.0

1 0

[PATCH compass-ci] git_mirror.rb: fix that project name start with capital letter can't match
by Li Yuanchao 06 Jan '21

06 Jan '21

Some repositories' name start with capital letter, but upstream-repos all start with lower case letter. So such repository can't match git_repo when use webhook container. Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index ce1dc9e..bd55b33 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -333,7 +333,7 @@ class MirrorMain git_repo = "#{project}/#{fork_name}" return git_repo if check_git_repo(git_repo, webhook_url) - git_repo = "#{project[0]}/#{project}/#{project}" + git_repo = "#{project[0].downcase}/#{project}/#{project}" return git_repo if check_git_repo(git_repo, webhook_url) puts "webhook: #{webhook_url} is not found!" -- 2.23.0

1 0

[PATCH compass-ci] sparrow: make gem install system wide
by Wu Fengguang 06 Jan '21

06 Jan '21

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- sparrow/0-package/common | 2 +- sparrow/5-build/overcommit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sparrow/0-package/common b/sparrow/0-package/common index 57ab701..4a9da60 100755 --- a/sparrow/0-package/common +++ b/sparrow/0-package/common @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -gem install git activesupport rest-client cucumber json faye-websocket elasticsearch +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 diff --git a/sparrow/5-build/overcommit b/sparrow/5-build/overcommit index e8add6f..af02d84 100755 --- a/sparrow/5-build/overcommit +++ b/sparrow/5-build/overcommit @@ -10,4 +10,4 @@ cd overcommit oc_build_out=$(gem build overcommit.gemspec | grep "overcommit-.*\.gem") -gem install "$oc_build_out" +gem install --no-user-install "$oc_build_out" -- 2.23.0

1 0

[PATCH v2 compass-ci] git_mirror.rb: fix rubocop warning
by Li Yuanchao 06 Jan '21

06 Jan '21

git_mirror.rb:352:35: W: Lint/UnusedMethodArgument: Unused method argument - parent_project. If it's necessary, use _ or _parent_project as an argument name to indicate that it won't be used. def handle_submodule(submodule, parent_project) ^^^^^^^^^^^^^^ git_mirror.rb:358:7: W: Lint/NonLocalExitFromIterator: Non-local exit from iterator, without return value. next, break, Array#find, Array#any?, etc. is preferred. return unless git_repo ^^^^^^ Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 7f265d9..ce1dc9e 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -349,13 +349,13 @@ class MirrorMain end end - def handle_submodule(submodule, parent_project) + def handle_submodule(submodule) submodule.each_line do |line| next unless line.include?('url = ') url = line.split(' = ')[1].chomp git_repo = url.split('://')[1] if url.include?('://') - return unless git_repo + break unless git_repo @git_info[git_repo] = { 'url' => url, 'git_repo' => git_repo, 'is_submodule' => true } fork_stat_init(git_repo) -- 2.23.0

1 0

[PATCH lkp-tests] tests/host-info: computing vm memory
by Wei Jihui 06 Jan '21

06 Jan '21

[why] it can not compute vm memory when vm memory less than 16G. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- tests/host-info | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/host-info b/tests/host-info index fe55d1ff..2721648c 100755 --- a/tests/host-info +++ b/tests/host-info @@ -4,8 +4,8 @@ get_memory() { memory_total=$(cat /proc/meminfo |grep MemTotal | awk '{print $2}') - memory_new=$(awk 'BEGIN{printf "%0.2f", '$memory_total'/1024/1024/16}') - memory=$(echo `expr $(echo $memory_new | awk '{print int($0)+1}') \* 16`)G + memory_new=$(awk 'BEGIN{printf "%0.2f", '$memory_total'/1024/1024}') + memory=$(echo $memory_new | awk '{print int($0)+1}')G echo "memory: $memory" } -- 2.23.0

3 2

[PATCH v4 compass-ci] tutorial.md: update initramfs tutorial.md
by Wang Chenglong 06 Jan '21

06 Jan '21

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- doc/tutorial.md | 71 ++++++++++++------------------------------------- 1 file changed, 17 insertions(+), 54 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index bf72630..bab40bc 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -150,61 +150,24 @@ job yaml ��[YAML](http://yaml.org/YAM #### �� - 1. �� os �� rootfs�� openEuler �� - - �� docker �� rootfs - - 1) �� openEuler �� docker �� - - ```bash - wget https://repo.openeuler.org/openEuler-20.03-LTS/docker_img/aarch64/openEuler… - ``` - 2) �� docker �� - ```bash - docker load -i openEuler-docker.aarch64 - ``` - - 3) �� openEuler �� - ```bash - docker run -id openeuler-20.03-lts - ``` - 4) �� docker �� rootfs - ```bash - docker cp -a docker run -d openeuler-20.03-lts:/ openEuler-rootfs - ``` - - �� qemu.img(qcow2��)�� rootfs (openEuler��) - - - 1) �� openEule r�� qcow2 �� - ```bash - wget https://repo.openeuler.org/openEuler-20.03-LTS/virtual_machine_img/aarch64/… - ``` - 2) ��{compass-ci}/container/qcow2rootfs ��rootfs - ```bash - cd {compass-ci}/container/qcow2rootfs - ./run openEuler-20.03-LTS.aarch64.qcow2.xz /tmp/openEuler-rootfs - ``` - 2. ��rootfs - 1. ��chroot�� rootfs (�� root ��) - ```bash - chroot openEuler-rootfs - ``` - 2. �� - - a. �� root �� - b. �� ssh �� - c. �� - d. �� docker �� osimage �� - > 1. �� - > 2. �� centos ��rpm�� - > 3. �� yum �� - > 4. �� docker �� - - 3. �� rootfs�� - ```bash - cd $rootfs - find . | coip -o -Hnewc |gzip -9 > $os_name.cgz - ``` + 1. �� openEuler �� + ```bash + cd {compass-ci}/rootfs/initramfs/openeuler/aarch64/20.03-LTS/ + ./run + ``` + + 2. ��/�� + �� {compass-ci} ��rootfs�� rootfs ��/�� + ```bash + mkdir rootfs + cd rootfs + zcat ../$os_name.cgz | cpio -idmv + find ./lib/modules/* | cpio -o -Hnewc | gzip -9 > $HOME/modules-$os_name.cgz + find ./usr/src/kernels/* | cpio -o -Hnewc | gzip -9 > $HOME/headers-$os_name.cgz + ``` + #### FAQ + 1. �� Unable to mount root fs on unknown-block�� - �� ```bash -- 2.23.0

2 3

[PATCH lkp-tests 1/2] stats/crystal/kernbench.cr: create kernbench.cr as same content with stats/kernbench
by Lu Kaiyi 06 Jan '21

06 Jan '21

create kernbench.cr in crystal directory from stats/kernbench first, and then, the second patch will know what has changed from original file. Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- stats/crystal/kernbench.cr | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 stats/crystal/kernbench.cr diff --git a/stats/crystal/kernbench.cr b/stats/crystal/kernbench.cr new file mode 100644 index 000000000..0da37fe88 --- /dev/null +++ b/stats/crystal/kernbench.cr @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby + +LKP_SRC = ENV['LKP_SRC'] || File.dirname(File.dirname(File.realpath($PROGRAM_NAME))) + +require "#{LKP_SRC}/lib/statistics" + +$stdin.each_line do |line| + case line + when /Elapsed Time/ + puts 'elapsed_time: ' + line.split[2] + puts 'elapsed_time_stddev: ' + line.split[3].gsub(/[()]/, "") + when /User Time/ + puts 'user_time: ' + line.split[2] + puts 'user_time_stddev: ' + line.split[3].gsub(/[()]/, "") + when /System Time/ + puts 'system_time: ' + line.split[2] + puts 'system_time_stddev: ' + line.split[3].gsub(/[()]/, "") + when /Percent CPU/ + puts 'percent_cpu: ' + line.split[2] + puts 'percent_cpu_stddev: ' + line.split[3].gsub(/[()]/, "") + when /Context Switches/ + puts 'context_switches: ' + line.split[2] + puts 'context_switches_stddev: ' + line.split[3].gsub(/[()]/, "") + when /Sleeps/ + puts 'sleeps: ' + line.split[1] + puts 'sleeps_stddev: ' + line.split[2].gsub(/[()]/, "") + end +end -- 2.23.0

2 1