- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] lib/job.rb: delete useless var
by Wei Jihui 10 Dec '20

10 Dec '20

@job2 is {} all the time, so it is useless. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- lib/job.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/job.rb b/lib/job.rb index e94b6c85..b41d55a7 100755 --- a/lib/job.rb +++ b/lib/job.rb @@ -433,7 +433,6 @@ class Job i = include_files job = deepcopy(@job) - revise_hash(job, deepcopy(@job2), true) job['___'] = nil @jobx = job if @job.include?(:expand_params) @@ -498,8 +497,6 @@ class Job return unless first_time - revise_hash(@job, @job2, true) - return if @overrides.empty? key = comment_to_symbol('user overrides') @@ -729,7 +726,6 @@ class Job def each_jobs(&block) each_job_init job = deepcopy(@job) - @job2 = {} load_defaults load_hosts_config each_job_init @@ -738,7 +734,6 @@ class Job @load_hosts_done = false @job = deepcopy(job) @job.merge!(hash) - @job2 = {} load_defaults load_hosts_config each_job_init -- 2.23.0

1 0

[PATCH lkp-tests] jobs: rename pub_key to ssh_pub_key
by Zhang Yale 10 Dec '20

10 Dec '20

As top level job key, the name should be more exact. Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/borrow-10d.yaml | 2 +- jobs/borrow-1d.yaml | 2 +- jobs/borrow-1h.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/borrow-10d.yaml b/jobs/borrow-10d.yaml index a2b50025..e0e35e17 100644 --- a/jobs/borrow-10d.yaml +++ b/jobs/borrow-10d.yaml @@ -1,7 +1,7 @@ suite: borrow testcase: borrow -pub_key: <%= +ssh_pub_key: <%= begin File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp rescue diff --git a/jobs/borrow-1d.yaml b/jobs/borrow-1d.yaml index 7767f2d7..c31d7ebd 100644 --- a/jobs/borrow-1d.yaml +++ b/jobs/borrow-1d.yaml @@ -3,7 +3,7 @@ testcase: borrow timeout: 1d -pub_key: <%= +ssh_pub_key: <%= begin File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp rescue diff --git a/jobs/borrow-1h.yaml b/jobs/borrow-1h.yaml index f2fedd20..d6b72c43 100644 --- a/jobs/borrow-1h.yaml +++ b/jobs/borrow-1h.yaml @@ -1,7 +1,7 @@ suite: borrow testcase: borrow -pub_key: <%= +ssh_pub_key: <%= begin File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp rescue -- 2.23.0

1 0

[PATCH compass-ci] container/defconfig: fix bug
by Luan Shengde 10 Dec '20

10 Dec '20

[why] sometimes we may add new yaml file at $HOME/.config/compass-ci/defaults/ if we reference the defconfig.rb before we put anything to the file, error may occur: TypeError: no implicit conversion of false into Hash if the file is not in a standard format of yaml file, error may occur: TypeError: no implicit conversion of String into Hash [how] add update {} for the hash if YAML.load_file() end with errors Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/defconfig.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/defconfig.rb b/container/defconfig.rb index c0768ca..d353bb3 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -9,7 +9,7 @@ def cci_defaults hash = {} Dir.glob(['/etc/compass-ci/defaults/*.yaml', "#{ENV['HOME']}/.config/compass-ci/defaults/*.yaml"]).each do |file| - hash.update YAML.load_file(file) + hash.update YAML.load_file(file) || {} end hash end -- 2.23.0

1 0

[PATCH lkp-tests 3/3] iso2rootfs: allow install some packages to result rootfs
by Yu Chuan 10 Dec '20

10 Dec '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- jobs/iso2rootfs.yaml | 4 ++++ tests/iso2rootfs | 34 ++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index c67faf44147d..a84f7583de94 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -34,6 +34,10 @@ iso2rootfs: # - no_fstab: will comment all line in /etc/fstab. config_rootfs: + ## install pkgs for result rootfs + ## - example: vim, git, xxx + rootfs_install_pkgs: + ################# # dailybuild related fields ################# diff --git a/tests/iso2rootfs b/tests/iso2rootfs index dbb409d16923..c8c9318436c9 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -203,17 +203,24 @@ get_cgz() tar -xf "${cgz_path_t}" -C "${CGZ_PATH}" } -install_pkgs() +get_pkg_installer() { - local pkg_installer - command -v yum && pkg_installer="yum" + local installer + + [ -d "/etc/yum/" ] && installer=yum + [ -d "/etc/apt/" ] && installer=apt - [[ -n "$pkg_installer" ]] || die "cannot find pkg installer." + [ -n "$installer" ] || die "cannot find pkg installer." + echo $installer +} + +install_pkgs() +{ + local installer=$(get_pkg_installer) - local pt for pt do - "$pkg_installer" install -y "$pt" || die "cannot install pkg: $pt." + "$installer" install -y "$pt" || die "cannot install pkg: $pt." done } @@ -367,11 +374,26 @@ disable_fstab() sed -i 's/^$[^#]$/#\1/g' "${ROOTFS_DES_DIR}/etc/fstab" } +rootfs_install_pkgs() +{ + [ -n "$rootfs_install_pkgs" ] || return 0 + + local installer=$(get_pkg_installer) + + if [ "$installer" == "yum" ]; then + "$installer" install -y --installroot=${ROOTFS_DES_DIR} ${rootfs_install_pkgs//,/ } + elif [ "$installer" == "apt" ]; then + "$installer" install -y -o RootDir=${ROOTFS_DES_DIR} ${rootfs_install_pkgs//,/ } + fi +} + config_rootfs() { config_dns_resolver disable_selinux disable_fstab + + rootfs_install_pkgs } ############ test rootfs ############ -- 2.23.0

2 2

[PATCH v2 lkp-tests 1/3] sbin/set-env.sh: modify the method of adding env-variables
by Hu Xuejiao 10 Dec '20

10 Dec '20

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- sbin/set-env.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sbin/set-env.sh b/sbin/set-env.sh index a8b161fa..18024e1a 100644 --- a/sbin/set-env.sh +++ b/sbin/set-env.sh @@ -2,10 +2,16 @@ . lib/env.sh -write_shellrc() +write_shell_profile() { - echo "export LKP_SRC=$PWD" >> $(shell_profile) - echo "export PATH=\$PATH:\$LKP_SRC/sbin:\$LKP_SRC/bin" >> $(shell_profile) + if [ $# -gt 0 ]; then + echo $@ >> $(shell_profile) + else + echo "export LKP_SRC=$PWD" >> $(shell_profile) + echo "export PATH=\$PATH:\$LKP_SRC/sbin:\$LKP_SRC/bin" >> $(shell_profile) + fi + + source $(shell_profile) } write_host() @@ -28,5 +34,5 @@ write_host() EOF } -write_shellrc +write_shell_profile write_host -- 2.23.0

2 1

[PATCH lkp-tests 1/3] iso2rootfs: result rootfs support disable fstab
by Yu Chuan 10 Dec '20

10 Dec '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- jobs/iso2rootfs.yaml | 1 + tests/iso2rootfs | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/jobs/iso2rootfs.yaml b/jobs/iso2rootfs.yaml index 2c4d3a93ff62..9123bef24ae5 100644 --- a/jobs/iso2rootfs.yaml +++ b/jobs/iso2rootfs.yaml @@ -21,6 +21,7 @@ iso2rootfs: ## supported fields: ## - dns: will config /etc/resolv.conf. ## - no_selinux: will disable selinux in /etc/selinux/config. + ## - no_fstab: will comment all line in /etc/fstab. config_rootfs: # dailybuild related fields diff --git a/tests/iso2rootfs b/tests/iso2rootfs index 9adbc930b48f..c03235eb2d2b 100755 --- a/tests/iso2rootfs +++ b/tests/iso2rootfs @@ -361,10 +361,17 @@ disable_selinux() sed -i 's/^SELINUX=.*/SELINUX=disabled/g' "${ROOTFS_DES_DIR}/etc/selinux/config" } +disable_fstab() +{ + echo "${config_rootfs}" | grep -qw 'no_fstab' || return 0 + sed -i 's/^$[^#]$/#\1/g' "${ROOTFS_DES_DIR}/etc/fstab" +} + config_rootfs() { config_dns_resolver disable_selinux + disable_fstab } ############ test rootfs ############ -- 2.23.0

2 2

[PATCH v2 compass-ci] manual/如何申请测试机.md: change the borrow-1h.yaml to latest
by Zhang Yale 10 Dec '20

10 Dec '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- doc/manual/borrow-machine.zh.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/manual/borrow-machine.zh.md b/doc/manual/borrow-machine.zh.md index 04be9cf..578bfe3 100644 --- a/doc/manual/borrow-machine.zh.md +++ b/doc/manual/borrow-machine.zh.md @@ -207,14 +207,14 @@ suite: borrow testcase: borrow + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> sshd: - pub_key: <%= - begin - File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp - rescue - nil - end - %> # sleep at the bottom sleep: 1h hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml -- 2.23.0

2 2

[PATCH compass-ci] doc/tutorial.md: update cci-depends tutorial
by Wang Yong 10 Dec '20

10 Dec '20

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- doc/tutorial.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/tutorial.md b/doc/tutorial.md index e6f8491..f89f070 100644 --- a/doc/tutorial.md +++ b/doc/tutorial.md @@ -271,11 +271,9 @@ job yaml 是测试描述和执行的基本单元，以[YAML](http://yaml.org/YAM `vim lkp-tests/distro/depends/test` 2) 将测试用例所需debian下的包名填入创建的文件中 `echo "apache2" >> lkp-tests/distro/depends/test` - 3) 生成lkp-aarch64.cgz - `./crystal-ci/container/lkp-initrd/run` - 4) 提交测试用例 - `submit test.yaml` - 5) 查看结果 + 3) 提交测试用例 + `submit -a test.yaml` + 4) 查看结果 https://compass-ci.openeuler.org/jobs -- 2.23.0

2 4

[PATCH compass-ci] arch-nr_node-nr_cpu-memory.md: change 'SHELL' to 'YAML'
by Xu Xijian 10 Dec '20

10 Dec '20

The content format between ```SHELL and ``` is YAML, so modify the keyword. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- doc/job/arch-nr_node-nr_cpu-memory.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/job/arch-nr_node-nr_cpu-memory.md b/doc/job/arch-nr_node-nr_cpu-memory.md index 72cf497..7a1d396 100644 --- a/doc/job/arch-nr_node-nr_cpu-memory.md +++ b/doc/job/arch-nr_node-nr_cpu-memory.md @@ -3,7 +3,7 @@ Meaning: - Each test machine has some basic configurations, such as arch, nr_node, nr_cpu, memory these fields mean: -```SHELL +```YAML arch: the architecture of the machine. nr_node: number of NUMA nodes. nr_cpu: number of logical CPUs. @@ -12,7 +12,7 @@ Meaning: - These fields are from the file which in $LAB_SRC/hosts. - Here is an example of these fields in the host file: -```SHELL +```YAML arch: aarch64 nr_node: 4 nr_cpu: 96 -- 2.23.0

1 0

[PATCH v2 compass-ci] auto_submit.yaml: add os archlinux for buildpkg
by Li Yuanchao 10 Dec '20

10 Dec '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index b53b647..d0f4fbe 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -5,4 +5,5 @@ c/compass-ci/compass-ci: - testbox=taishan200-2280-2s64p-256g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml - testbox=taishan200-2280-2s64p-256g os=debian os_version=sid os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p16g os=openeuler os_version=20.03 os_mount=nfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-2p16g os=archlinux os_version=2020-11-12 os_mount=nfs os_arch=aarch64 build-pkg.yaml -- 2.23.0

1 0