February 2021 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] doc/manual: add document apply-account.zh.md
by Luan Shengde 04 Feb '21

04 Feb '21

add chinese document Signed-off-by: Luan Shengde <shdluan(a)163.com> --- doc/manual/apply-account.zh.md | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 doc/manual/apply-account.zh.md diff --git a/doc/manual/apply-account.zh.md b/doc/manual/apply-account.zh.md new file mode 100644 index 0000000..5e6605d --- /dev/null +++ b/doc/manual/apply-account.zh.md @@ -0,0 +1,58 @@ +# 账号申请 + +首先您需要一个账号，可以用来提交job，同时跟踪您的资源消费情况。 +因为目前我们的测试机资源池有限，因此需要做一些使用限制。 + +我们为平台测试所覆盖的开源软件（OSS）的贡献者提供了免费的账号。 +你可以通过在下面邮件中提供‘my oss commit’来验明正身您是一个开源软件（OSS）的贡献者。 + +我们同时也为我们的合作者提供了免费的账号。 +这种情况需要提供用的邮件，名字，ssh公钥，以及申请测试机的目的。 + +## 1. 发送邮件进行账号申请 + +邮件模板： + +--- + 发件人: {{ David Rientjes <rientjes(a)google.com> }} + 收件人: compass-ci-robot(a)qq.com + 邮件标题: apply account + + my oss commit: {{ https://github.com/torvalds/linux/commit/7be74942f184fdfba34ddd19a0d995deb3… }} + + {{ 将您的ssh公钥添加为邮件附件，例如 ~/.ssh/id_rsa.pub }} + +--- + +- 使用您的信息替换{{ }}中的内容 +- 邮件名应该使用英文或中文拼音，例如模板中的“David Rientjes” +- my oss commit: 使用您的邮件和名字提交的代码的地址。 + + + 您的仓库需要在平台测试覆盖的范围内，并且注册到： + [upstream-repos](https://gitee.com/wu_fengguang/upstream-repos). + 如果贡献的OSS工程仓库不在upstream-repos中，请参考： + [test-oss-project](https://gitee.com/wu_fengguang/lkp-tests/blob/master/doc/… + 将仓库注册到compass-ci测试池中。 + +## 2. 接收邮件 + +申请邮件成功后，您将收到反馈邮件，邮件内容包括以下信息： + + my_name + my_email + my_token + lab + +## 3. 一次性配置 + +根据步骤2收到邮件的提示，配置您的本地环境： + + git clone https://gitee.com/wu_fengguang/lkp-tests.git + setup ~/.config/compass-ci/defaults/account.yaml + ~/.config/compass-ci/include/lab/{{ lab }}.yaml + +## 4. 现在开始 + +[提交job到compass-ci](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/submit-job.en.md) + -- 2.23.0

1 0

[PATCH v2 compass-ci] doc/manual/apply-account: optimize document
by Luan Shengde 04 Feb '21

04 Feb '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- doc/manual/apply-account.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/manual/apply-account.md b/doc/manual/apply-account.md index fda2eba..974fe63 100644 --- a/doc/manual/apply-account.md +++ b/doc/manual/apply-account.md @@ -43,6 +43,7 @@ Which contains account information for you: my_name my_email my_token + lab ## step 3: one-time setup @@ -50,6 +51,7 @@ Which contains account information for you: git clone https://gitee.com/wu_fengguang/lkp-tests.git setup ~/.config/compass-ci/defaults/account.yaml + ~/.config/compass-ci/include/lab/{{ lab }}.yaml ## step 4: try it out -- 2.23.0

1 0

[PATCH lkp-tests] distro/debian: use function instead of command
by Wang Yong 04 Feb '21

04 Feb '21

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- distro/debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distro/debian b/distro/debian index 9b6636f48..313f73e35 100755 --- a/distro/debian +++ b/distro/debian @@ -171,7 +171,7 @@ distro_install_depends() add_i386_package update - apt-get install -yf + fixup_preinstall for script in $scripts do script=$(basename $script) -- 2.23.0

1 0

[PATCH compass-ci] doc/manual/apply-account: optimize document
by Luan Shengde 04 Feb '21

04 Feb '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- doc/manual/apply-account.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/manual/apply-account.md b/doc/manual/apply-account.md index fda2eba..ac7ce5e 100644 --- a/doc/manual/apply-account.md +++ b/doc/manual/apply-account.md @@ -43,6 +43,7 @@ Which contains account information for you: my_name my_email my_token + lab ## step 3: one-time setup @@ -50,6 +51,7 @@ Which contains account information for you: git clone https://gitee.com/wu_fengguang/lkp-tests.git setup ~/.config/compass-ci/defaults/account.yaml + ~/.config/compass-ci/include/lab/${lab}.yaml ## step 4: try it out -- 2.23.0

1 0

[PATCH v2 compass-ci 2/2] container/dracut-initrd: add rsync module to initrd
by Xu Xijian 04 Feb '21

04 Feb '21

Change filename add-cifs.conf to add-modules.conf, then add rsync module to dracut by put "rsync" into add-modules.conf. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/conf/{add-cifs.conf => add-modules.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename container/dracut-initrd/conf/{add-cifs.conf => add-modules.conf} (100%) diff --git a/container/dracut-initrd/conf/add-cifs.conf b/container/dracut-initrd/conf/add-modules.conf similarity index 100% rename from container/dracut-initrd/conf/add-cifs.conf rename to container/dracut-initrd/conf/add-modules.conf -- 2.23.0

1 0

[PATCH v2 compass-ci] doc/write-PKGBUILD: fix documentation errors
by Lin Jiaxin 04 Feb '21

04 Feb '21

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- doc/manual/write-PKGBUILD.en.md | 5 +++-- doc/manual/write-PKGBUILD.zh.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/manual/write-PKGBUILD.en.md b/doc/manual/write-PKGBUILD.en.md index c0c25e9..c259399 100644 --- a/doc/manual/write-PKGBUILD.en.md +++ b/doc/manual/write-PKGBUILD.en.md @@ -13,8 +13,9 @@ PKGBUILD includes variables and functions. - pkgrel: Mandatory. It indicates the release number of a software package. - arch: Mandatory. It indicates the architecture sequence of a software package. - depends: Optional. It indicates the name of the dependency package required for running a software test. -- makedepends: Optional. It indicates the list of files required for building a software package. -- source: Optional. It indicates the MD5 hash value of each source file to verify the integrity of the source file during the build process. +- makedepends: Optional. It indicates the name of the dependency package required for building a software package. +- source: Optional. It indicates the list of files required for building a software package. +- md5sums: Optional. It indicates the MD5 hash value of each source file to verify the integrity of the source file during the build process. ## Defining a Function diff --git a/doc/manual/write-PKGBUILD.zh.md b/doc/manual/write-PKGBUILD.zh.md index 414bfdc..ff53f0f 100644 --- a/doc/manual/write-PKGBUILD.zh.md +++ b/doc/manual/write-PKGBUILD.zh.md @@ -13,8 +13,9 @@ PKGBUILD�� - pkgrel: �� - arch: �� - depends: �� -- makedepends: �� -- source: ��MD5�� +- makedepends: �� +- source: �� +- md5sums: ��MD5�� ## �� -- 2.23.0

1 0

[PATCH compass-ci] container/dracut-initrd: add --fix-missing when apt-get install
by Xu Xijian 04 Feb '21

04 Feb '21

Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- container/dracut-initrd/bin/setup-dracut.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container/dracut-initrd/bin/setup-dracut.sh b/container/dracut-initrd/bin/setup-dracut.sh index 7e2bf51..75148a1 100755 --- a/container/dracut-initrd/bin/setup-dracut.sh +++ b/container/dracut-initrd/bin/setup-dracut.sh @@ -5,9 +5,9 @@ export DEBIAN_FRONTEND=noninteractive apt-get update -apt-get install -y --no-install-recommends apt-utils >/dev/null 2>&1 -apt-get install -y nfs-common netbase cifs-utils kmod rsync -apt-get install -y dracut dracut-network dracut-config-generic +apt-get install -y --fix-missing --no-install-recommends apt-utils >/dev/null 2>&1 +apt-get install -y --fix-missing nfs-common netbase cifs-utils kmod rsync +apt-get install -y --fix-missing dracut dracut-network dracut-config-generic apt-get clean rm -rf /var/lib/apt/lists/* -- 2.23.0

1 0

[PATCH v2 compass-ci] providers/lib: introduce domain.rb action.rb
by Xiao Shenwei 04 Feb '21

04 Feb '21

function: based on response of boot.libvirt generate a domain.xml refer-to: commit 457644c0486e0786ed8b563c6e4928445eea0207 if you want to test with your domain.xml, define vt field in job.yaml vt: domain: xxx/xxx.xml if not will use default options to generate a domain.xml TODO: case 1: Impact of single factors on tasks: vt: cpu: xxx/cpu.xml case 2: Impact of multiple factors on tasks: vt: cpu: xxx/cpu.xml disk: xxx/disk.xml Signed-off-by: Xiao Shenwei <xiaoshenwei96(a)163.com> --- providers/lib/action.rb | 75 +++++++++++++++++++++++++++++++++++++++++ providers/lib/domain.rb | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 providers/lib/action.rb create mode 100644 providers/lib/domain.rb diff --git a/providers/lib/action.rb b/providers/lib/action.rb new file mode 100644 index 0000000..526d84d --- /dev/null +++ b/providers/lib/action.rb @@ -0,0 +1,75 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +# expand each element of the domain.xml +module Action + TEMPLATE_DIR = "#{ENV['CCI_SRC']}/providers/libvirt/templates" + def expand_erb(file) + @context.expand_erb(File.read(file)) + end + + def domain + @doc = Nokogiri::XML(expand_erb(@domain_option)) + end + + def name + @doc.xpath('//domain/name').remove + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/name.xml") + end + + def os + @doc.xpath('//domain/os').remove + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/os.xml") + end + + def emulator + @doc.xpath('//domain/devices/emulator').remove + @doc.xpath('//domain/devices')[0].add_child expand_erb("#{TEMPLATE_DIR}/emulator.xml") + end + + def cpu + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/cpu.xml") + end + + def memory + @doc.xpath('//domain/memory').remove + @doc.xpath('//domain/currentMemory').remove + @doc.xpath('//domain/maxMemory').remove + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/memory.xml") + end + + def devices + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/devices.xml") + end + + def disk + @context.info['disk'] ||= nil + @doc.xpath('//domain/devices')[0].add_child expand_erb("#{TEMPLATE_DIR}/disk.xml") + end + + def serial + @doc.xpath('//domain/devices/serial').remove + @doc.xpath('//domain/devices')[0].add_child expand_erb("#{TEMPLATE_DIR}/serial.xml") + end + + def interface + @doc.xpath('//domain/devices/interface').remove + @doc.xpath('//domain/devices')[0].add_child expand_erb("#{TEMPLATE_DIR}/interface.xml") + end + + def active + @doc.xpath('//domain/on_poweroff').remove + @doc.xpath('//domain/on_reboot').remove + @doc.xpath('//domain/on_crash').remove + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/active.xml") + end + + def clock + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/clock.xml") + end + + def seclabel + @doc.root.add_child expand_erb("#{TEMPLATE_DIR}/seclabel.xml") + end +end diff --git a/providers/lib/domain.rb b/providers/lib/domain.rb new file mode 100644 index 0000000..8df9c06 --- /dev/null +++ b/providers/lib/domain.rb @@ -0,0 +1,75 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'json' +require 'set' +require 'nokogiri' +require 'yaml' +require_relative 'action' +require_relative "#{ENV['LKP_SRC']}/lib/hashugar" + +# generate a domain.xml +class Domain + include Action + + TEMPLATE_DIR = "#{ENV['CCI_SRC']}/providers/libvirt/templates" + OPTION_FILE = "#{TEMPLATE_DIR}/options.yaml" + def initialize(context, logger) + @doc = nil + @context = context + @logger = logger + @options = Hashugar.new(YAML.safe_load(File.read(OPTION_FILE))) + end + + def generate + domain_option + if user_domain? + default_option + return + end + replaceable_option + default_option + end + + def save_to(filename) + File.open(filename, 'w') do |f| + f.puts @doc.to_xml + end + File.realpath(filename) + end + + private + + def user_domain? + @context.info['vt'].key?('domain') + end + + def load_xml_file(filepath) + host = @context.info['SRV_HTTP_HOST'] + port = @context.info['SRV_HTTP_PORT'] + system "wget --timestamping --progress=bar:force http://#{host}:#{port}/cci/libvirt-xml/#{filepath}" + %x(basename #{filepath}).chomp + end + + def domain_option + @domain_option = "#{TEMPLATE_DIR}/#{(a)options.domain}.xml" + if user_domain? + @domain_option = load_xml_file((a)context.info['vt']['domain']) + end + @logger.info("Domain option: #{@domain_option}") + domain + end + + def default_option + @options.default.each do |one| + instance_eval one + end + end + + def replaceable_option + @options.replaceable.each do |one| + instance_eval one + end + end +end -- 2.23.0

1 0

[PATCH v5 compass-ci 1/4] container/submit: Dockerfile
by Luan Shengde 04 Feb '21

04 Feb '21

Instal lkp-tests and its deps in the container instead of install them at localhost. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/submit/Dockerfile | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 container/submit/Dockerfile diff --git a/container/submit/Dockerfile b/container/submit/Dockerfile new file mode 100644 index 0000000..5ea0fcc --- /dev/null +++ b/container/submit/Dockerfile @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM debian + +MAINTAINER Luan Shengde <shdluan(a)163.com> + +ENV DEBIAN_FRONTEND noninteractive + +# it may take a long time, even break up if you use default source address to install pkgs. +# you can delete the following step if you do not want to use it. +RUN echo 'deb [trusted=yes] http://mirrors.163.com/debian/ buster main non-free contrib\n \ +deb [trusted=yes] http://mirrors.163.com/debian/ buster-updates main non-free contrib\n \ +deb [trusted=yes] http://mirrors.163.com/debian/ buster-backports main non-free contrib\n \ +deb [trusted=yes] http://mirrors.163.com/debian-security/ buster/updates main non-free contrib\n \ +\n \ +deb-src [trusted=yes] http://mirrors.163.com/debian/ buster main non-free contrib\n \ +deb-src [trusted=yes] http://mirrors.163.com/debian/ buster-updates main non-free contrib\n \ +deb-src [trusted=yes] http://mirrors.163.com/debian/ buster-backports main non-free contrib\n \ +deb-src [trusted=yes] http://mirrors.163.com/debian-security/ buster/updates main non-free contrib\n' \ +> /etc/apt/sources.list + +RUN apt-get update && \ + apt-get install -y git ruby ruby-dev make libssl-dev gcc g++ sudo uuid-runtime + +# it may take a long time, even break up if you use default source address for the gem. +# delete the following step if you do not want to use the default one. +RUN gem sources --add https://gems.ruby-china.com/ && \ + gem sources --remove https://rubygems.org/ + +RUN gem install git faye-websocket activesupport rest-client + +WORKDIR /root + +RUN git clone https://gitee.com/wu_fengguang/lkp-tests.git +RUN cd lkp-tests && make install -- 2.23.0

2 2

[PATCH compass-ci] doc/write-PKGBUILD: fix documentation errors
by Lin Jiaxin 03 Feb '21

03 Feb '21

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- doc/manual/write-PKGBUILD.en.md | 5 +++-- doc/manual/write-PKGBUILD.zh.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/manual/write-PKGBUILD.en.md b/doc/manual/write-PKGBUILD.en.md index c0c25e9..c259399 100644 --- a/doc/manual/write-PKGBUILD.en.md +++ b/doc/manual/write-PKGBUILD.en.md @@ -13,8 +13,9 @@ PKGBUILD includes variables and functions. - pkgrel: Mandatory. It indicates the release number of a software package. - arch: Mandatory. It indicates the architecture sequence of a software package. - depends: Optional. It indicates the name of the dependency package required for running a software test. -- makedepends: Optional. It indicates the list of files required for building a software package. -- source: Optional. It indicates the MD5 hash value of each source file to verify the integrity of the source file during the build process. +- makedepends: Optional. It indicates the name of the dependency package required for building a software package. +- source: Optional. It indicates the list of files required for building a software package. +- md5sums: Optional. It indicates the MD5 hash value of each source file to verify the integrity of the source file during the build process. ## Defining a Function diff --git a/doc/manual/write-PKGBUILD.zh.md b/doc/manual/write-PKGBUILD.zh.md index 414bfdc..ff53f0f 100644 --- a/doc/manual/write-PKGBUILD.zh.md +++ b/doc/manual/write-PKGBUILD.zh.md @@ -13,8 +13,9 @@ PKGBUILD�� - pkgrel: �� - arch: �� - depends: �� -- makedepends: �� -- source: ��MD5�� +- makedepends: �� +- source: �� +- md5sums: ��MD5�� ## �� -- 2.23.0

1 0