- Compass-ci - mailweb.openeuler.org

[PATCH v2 compass-ci] auto_submit.yaml: os_version needs specific version number now
by Li Yuanchao 30 Oct '20

30 Oct '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 6d7dc2a..f741b79 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,8 +1,8 @@ AvxToNeon/AvxToNeon: -- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-2p8g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-2p8g os=debian os_version=sid os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g os=centos os_version=7.6.1810 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-2p8g 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=initramfs os_arch=aarch64 build-pkg.yaml -- 2.23.0

3 2

[PATCH v5 compass-ci] sparrow/0-package: fix: failed to download lockfile-create in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[why] when execute sparrow/4-docker/buildall in x86_64 machine error: lockfile-create: command not found because wget link and rpm only support aarch64 now [how] 1. use $(arch), support download lockfile-create command according to different system architecture. 2. delete redundant rpm files after download. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..79af2b9 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,8 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/$(arch)/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.$(arch).rpm lockfile-progs-0.1.18-5-omv4002.$(arch).rpm +rm -rf *.rpm -- 2.23.0

1 0

[PATCH compass-ci] auto_submit: delete commit date as it's redundant
by Li Yuanchao 30 Oct '20

30 Oct '20

bisect get commit date itself, commit date here is unnecessary Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit | 2 -- 1 file changed, 2 deletions(-) diff --git a/sbin/auto_submit b/sbin/auto_submit index 21958d3..8845b13 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -31,12 +31,10 @@ class AutoSubmit def submit(newrefs_info, submit_argv) newrefs_info['new_refs']['heads'].each do |branch, commit_id| real_argvs = Array.new(submit_argv) - commit_date = `git -C /srv/git/#{newrefs_info['git_repo']}.git log --format=%ct -1 #{commit_id}` real_argvs.push("upstream_branch=#{branch.delete_prefix('refs/heads/')}") real_argvs.push("upstream_commit=#{commit_id}") tag = %x(git -C /srv/git/#{newrefs_info['git_repo']}.git tag --points-at #{commit_id}) real_argvs.push("upstream_tag=#{tag}") unless tag.empty? - real_argvs.push("commit_date=#{commit_date}") system(real_argvs.join(' ')) end -- 2.23.0

3 2

[PATCH v3 compass-ci] sparrow/0-package: fix: failed to download lockfile-create in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[what] when execute sparrow/4-docker/buildall in x86_64 machine [error] lockfile-create: command not found [how] use arch=$(arch), support download lockfile-create command in aarch64 and x86_64. [why] weget link and rpm not support ${arch}, must use arch=$(arch) Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..31d795d 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,8 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm -- 2.23.0

5 7

Re: [PATCH v2 compass-ci] parrow/0-package: fix lockfile-create download failed in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

>>+wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… > >Why not use $(arch) directly? good Thanks, Yinsi > >>-rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm >>+rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm > >Thanks, >Zhangyu

1 0

[PATCH v2 compass-ci] parrow/0-package: fix lockfile-create download failed in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[how] use arch=$(arch), support download lockfile-create command in aarch64 and x86_64. [why] weget link and rpm not support ${arch}, must use arch=$(arch) Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..31d795d 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,8 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm -- 2.23.0

3 3

[PATCH v4 compass-ci] sparrow/0-package: fix: failed to download lockfile-create in x86_64
by Liu Yinsi 30 Oct '20

30 Oct '20

[what] when execute sparrow/4-docker/buildall in x86_64 machine [error] lockfile-create: command not found [how] 1. wget link and rpm not support ${arch}, must use arch=$(arch) to support download lockfile-create command in aarch64 and x86_64. 2. delete rpm file after download. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/openEuler | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index ba298c8..ea4b29a 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -23,7 +23,9 @@ pkgs=( yum install -y --skip-broken "${pkgs[@]}" -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… +arch=$(arch) +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… +wget http://rpmfind.net/linux/openmandriva/cooker/repository/${arch}/main/releas… -rpm -i lib64lockfile1-1.16-1-omv4002.aarch64.rpm lockfile-progs-0.1.18-5-omv4002.aarch64.rpm +rpm -i lib64lockfile1-1.16-1-omv4002.${arch}.rpm lockfile-progs-0.1.18-5-omv4002.${arch}.rpm +rm -rf *.rpm -- 2.23.0

2 1

[PATCH lab-z9] hosts: add host file a103-a107
by Zhang Yu 30 Oct '20

30 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a103 | 22 ++++++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a104 | 22 ++++++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a106 | 22 ++++++++++++++++++++++ hosts/taishan200-2280-2s48p-256g--a107 | 22 ++++++++++++++++++++++ hosts/taishan200-2280-2s48p-512g--a105 | 22 ++++++++++++++++++++++ 5 files changed, 110 insertions(+) create mode 100644 hosts/taishan200-2280-2s48p-256g--a103 create mode 100644 hosts/taishan200-2280-2s48p-256g--a104 create mode 100644 hosts/taishan200-2280-2s48p-256g--a106 create mode 100644 hosts/taishan200-2280-2s48p-256g--a107 create mode 100644 hosts/taishan200-2280-2s48p-512g--a105 diff --git a/hosts/taishan200-2280-2s48p-256g--a103 b/hosts/taishan200-2280-2s48p-256g--a103 new file mode 100644 index 0000000..304c6fc --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a103 @@ -0,0 +1,22 @@ +<<: hosts/taishan200-2280-2s48p-256g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b88bdc69 + - /dev/disk/by-id/scsi-350000399b88bdd85 + - /dev/disk/by-id/scsi-350000399b88bdc4d + - /dev/disk/by-id/scsi-350000399b88bdc7d +mac_addr: + - 44:67:47:c9:d8:b8 + - 44:67:47:c9:d8:b9 + - 44:67:47:c9:d8:ba + - 44:67:47:c9:d8:bb + - 44:67:47:c9:d8:bc + - 44:67:47:c9:d8:bd + - 44:67:47:c9:d8:be + - 44:67:47:c9:d8:bf + - cc:05:77:ee:b5:4f + - cc:05:77:ee:b5:50 + - cc:05:77:ee:b5:51 + - cc:05:77:ee:b5:52 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.8 diff --git a/hosts/taishan200-2280-2s48p-256g--a104 b/hosts/taishan200-2280-2s48p-256g--a104 new file mode 100644 index 0000000..a8a2789 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a104 @@ -0,0 +1,22 @@ +<<: hosts/taishan200-2280-2s48p-256g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8892431 + - /dev/disk/by-id/scsi-350000399b8892f81 + - /dev/disk/by-id/scsi-350000399b8891c49 + - /dev/disk/by-id/scsi-350000399b88930d1 +mac_addr: + - 44:67:47:d7:6d:f0 + - 44:67:47:d7:6d:f1 + - 44:67:47:d7:6d:f2 + - 44:67:47:d7:6d:f3 + - 44:67:47:d7:6d:f4 + - 44:67:47:d7:6d:f5 + - 44:67:47:d7:6d:f6 + - 44:67:47:d7:6d:f7 + - cc:05:77:ee:b9:6f + - cc:05:77:ee:b9:70 + - cc:05:77:ee:b9:71 + - cc:05:77:ee:b9:72 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.9 diff --git a/hosts/taishan200-2280-2s48p-256g--a106 b/hosts/taishan200-2280-2s48p-256g--a106 new file mode 100644 index 0000000..ad587b3 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a106 @@ -0,0 +1,22 @@ +<<: hosts/taishan200-2280-2s48p-256g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b883bf99 + - /dev/disk/by-id/scsi-350000399b883ba89 + - /dev/disk/by-id/scsi-350000399b883b94d + - /dev/disk/by-id/scsi-350000399b883b981 +mac_addr: + - 44:67:47:86:1c:30 + - 44:67:47:86:1c:31 + - 44:67:47:86:1c:32 + - 44:67:47:86:1c:33 + - 44:67:47:86:1c:34 + - 44:67:47:86:1c:35 + - 44:67:47:86:1c:36 + - 44:67:47:86:1c:37 + - cc:05:77:ee:b7:df + - cc:05:77:ee:b7:e0 + - cc:05:77:ee:b7:e1 + - cc:05:77:ee:b7:e2 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.11 diff --git a/hosts/taishan200-2280-2s48p-256g--a107 b/hosts/taishan200-2280-2s48p-256g--a107 new file mode 100644 index 0000000..fba1937 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-256g--a107 @@ -0,0 +1,22 @@ +<<: hosts/taishan200-2280-2s48p-256g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b8917c39 + - /dev/disk/by-id/scsi-350000399b8918005 + - /dev/disk/by-id/scsi-350000399b8900a4d + - /dev/disk/by-id/scsi-350000399b8900799 +mac_addr: + - 84:46:fe:73:a2:71 + - 84:46:fe:73:a2:72 + - 84:46:fe:73:a2:73 + - 84:46:fe:73:a2:74 + - 84:46:fe:73:a2:75 + - 84:46:fe:73:a2:76 + - 84:46:fe:73:a2:77 + - 84:46:fe:73:a2:78 + - 44:a1:91:35:1a:70 + - 44:a1:91:35:1a:71 + - 44:a1:91:35:1a:72 + - 44:a1:91:35:1a:73 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.12 diff --git a/hosts/taishan200-2280-2s48p-512g--a105 b/hosts/taishan200-2280-2s48p-512g--a105 new file mode 100644 index 0000000..096b5b0 --- /dev/null +++ b/hosts/taishan200-2280-2s48p-512g--a105 @@ -0,0 +1,22 @@ +<<: hosts/taishan200-2280-2s48p-512g +nr_hdd_partitions: 4 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399b891945d + - /dev/disk/by-id/scsi-350000399b8919135 + - /dev/disk/by-id/scsi-350000399b8919699 + - /dev/disk/by-id/scsi-350000399b89190d5 +mac_addr: + - 44:67:47:d7:76:c4 + - 44:67:47:d7:76:c5 + - 44:67:47:d7:76:c6 + - 44:67:47:d7:76:c7 + - 44:67:47:d7:76:c8 + - 44:67:47:d7:76:c9 + - 44:67:47:d7:76:ca + - 44:67:47:d7:76:cb + - cc:05:77:ee:b2:8f + - cc:05:77:ee:b2:90 + - cc:05:77:ee:b2:91 + - cc:05:77:ee:b2:92 +model_name: Kunpeng-920 +ipmi_ip: 9.3.10.10 -- 2.23.0

1 0

[PATCH v8 compass-ci] sparrow: fix containers auto resume failed after reboot
by Liu Yinsi 30 Oct '20

30 Oct '20

[why] some containers have start-depends, docker start "${containers[@]}" also cause container service resume failed, need start its dependence firstly. [how] 1. add param(action) to buildall script. 2. if first deploy cci, $action is none, buildall script will execute: - $CONTAINER/build; - $CONTAINER/install; - $CONTAINER/first-run; - $CONTAINER/start script. 3. if reboot, $action will be 'reboot', buildall script will execute: - $CONTAINER/first-run; - $CONTAINER/start script. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/4-docker/buildall | 7 +++++-- sparrow/7-systemd/cci-network | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sparrow/4-docker/buildall b/sparrow/4-docker/buildall index 230c6ac..6e0a2f8 100755 --- a/sparrow/4-docker/buildall +++ b/sparrow/4-docker/buildall @@ -3,6 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. CONTAINER_PATH="$CCI_SRC/container" +export action=$1 build_depends() { @@ -30,8 +31,10 @@ do_one() ( cd $container [ "$container_name" == 'sub-fluentd' ] && exit - [ -x build ] && ./build - [ -x install ] && ./install + if [ "$action" != "reboot" ]; then + [ -x build ] && ./build + [ -x install ] && ./install + fi [ -x first-run ] && ./first-run [ -x start ] && ./start ) diff --git a/sparrow/7-systemd/cci-network b/sparrow/7-systemd/cci-network index 4aadcdc..6e59dbb 100755 --- a/sparrow/7-systemd/cci-network +++ b/sparrow/7-systemd/cci-network @@ -4,7 +4,8 @@ #this file used in our own systemd unit file: cci-network.service. #contents as follows will be automatically executed after system reboot. -[[ $CCI_SRC ]] || CCI_SRC=/c/compass-ci +# export ENV +. /etc/profile.d/compass.sh $CCI_SRC/sparrow/2-network/br0 $CCI_SRC/sparrow/2-network/iptables @@ -12,5 +13,5 @@ $CCI_SRC/sparrow/2-network/nfs $CCI_SRC/sparrow/2-network/cifs # --restart=always option is not absolutely reliable -containers=($(docker ps -a |grep -v NAMES |awk '{print $NF}')) -[ -n "$containers" ] && docker start "${containers[@]}" >/dev/null 2>&1 +# container need to start its dependences firstly. +$CCI_SRC/sparrow/4-docker/buildall reboot -- 2.23.0

3 2

[PATCH compass-ci] delimiter: refactor init job content
by Cao Xueliang 30 Oct '20

30 Oct '20

[why] There are tow file need init job content, then use a function to wrap the code. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 8 +------- src/delimiter/find-commit/bisect_run_script.rb | 3 +-- src/delimiter/utils.rb | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index c548861..9033db2 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -35,13 +35,7 @@ class GitBisect end def set_bad_job - @bad_job = @es.query_by_id @bad_job_id - raise "es query job id: #{@bad_job_id} failed!" unless @bad_job - - @bad_job.delete('uuid') - @bad_job.delete('stats') - @bad_job.delete('id') - @bad_job.delete('error_ids') + @bad_job = Utils.init_job_content(@bad_job_id) end def set_upstream diff --git a/src/delimiter/find-commit/bisect_run_script.rb b/src/delimiter/find-commit/bisect_run_script.rb index d5e4226..4877d79 100755 --- a/src/delimiter/find-commit/bisect_run_script.rb +++ b/src/delimiter/find-commit/bisect_run_script.rb @@ -18,8 +18,7 @@ class GitBisectRun end def git_bisect - job = @es.query_by_id @job_id - job.delete('stats') if job.key?('stats') + job = Utils.init_job_content(@job_id) commit = `git -C #{@work_dir} log --pretty=format:"%H" -1` job['upstream_commit'] = commit get_bisect_status job diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 82cb918..679c8d9 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -87,5 +87,23 @@ module Utils return 'good' end + + def init_job_content(job_id) + es = ESQuery.new + job = es.query_by_id(job_id) + raise "es query job id: #{job_id} failed!" unless job + + job['bad_job_id'] = job_id + job['suite'] = 'bisect' + + job.delete('id') + job.delete('uuid') + job.delete('error_ids') + job.delete('start_time') + job.delete('end_time') + job.delete('loadavg') + + return job + end end end -- 2.23.0

3 4