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

[PATCH v2 compass-ci] sparrow: delete the same name install package
by Zhang Yu 29 Sep '20

29 Sep '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- sparrow/0-package/os/debian | 1 - 1 file changed, 1 deletion(-) diff --git a/sparrow/0-package/os/debian b/sparrow/0-package/os/debian index 8301500..68423d7 100755 --- a/sparrow/0-package/os/debian +++ b/sparrow/0-package/os/debian @@ -12,9 +12,8 @@ pkgs=( make docker.io ruby-full ruby-dev - bridge-utils qemu dmidecode lockfile-progs bridge-utils -- 2.23.0

1 0

[PATCH compass-ci 4/4] sparrow: open the masquerade at public zone
by Hu Xuejiao 29 Sep '20

29 Sep '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 831c1a3..0af422e 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -32,3 +32,4 @@ iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERAD firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" +firewall-cmd --zone=public --add-masquerade -- 2.23.0

1 0

[PATCH compass-ci] add "host" field to job
by Zhang Yuhang 29 Sep '20

29 Sep '20

Signed-off-by: Zhang Yuhang <zhangyuhang25(a)huawei.com> --- src/lib/job.cr | 22 ++++++++++++++++++++++ src/lib/sched.cr | 1 + 2 files changed, 23 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 53a560c..5008638 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -28,6 +28,19 @@ module JobHelper return tbox_group end + def self.match_host(testbox : String) + # "xxx-xxx-123" remove "-123" + find = testbox.match(/(.*)-\d+$/) + if testbox[0, 3] == "vm-" + # "vm-xxx-xxx--xxx" remove "--xxx" + # "vm-xxx-2xx-xxx" remove "-xxx" + find = testbox.match(/(.*)--.+$/) || + testbox.match(/(.*-\d\w*)-[a-zA-Z]+$/) || + find + end + find ? find[1] : testbox + end + def self.service_path(path) temp_path = File.real_path(path) return temp_path.split("/srv")[-1] @@ -161,6 +174,7 @@ class Job private def set_result_root update_tbox_group_from_testbox # id must exists, need update tbox_group + update_host_from_testbox # id must exists, need update host date = Time.local.to_s("%F") self["result_root"] = "/result/#{suite}/#{tbox_group}/#{date}/#{id}" @@ -186,6 +200,14 @@ class Job end end + # if not assign host, set it to a match result from testbox + # if job special host, should we just set host=host + private def update_host_from_testbox + if self["host"] == "" + @hash["host"] = JSON::Any.new(JobHelper.match_host(testbox)) + end + end + def [](key : String) : String "#{@hash[key]?}" end diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 15f5c9e..4e71959 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -226,6 +226,7 @@ class Sched # add to job content when multi-test job["testbox"] = tbox_group job.update_tbox_group(tbox_group) + job.update_host(tbox_group) job["node_roles"] = config["roles"].as_a.join(" ") job["node_macs"] = config["macs"].as_a.join(" ") -- 2.23.0

1 0

help star 2020-09-25
by Wu Fengguang 29 Sep '20

29 Sep '20

Jihui is our help star, thanks to kind and helpful Jihui! wfg@crystal ~/todo% bin/help-star people/*/credit/2020-09-25.md 25.7 Shi Zhichao 21.9 Wu Fengguang 12.1 Wei Jihui 11.0 Zhang Yu 10.8 Yu Chuan 10.2 Du Kaitian 9.7 Lu Weitao 9.2 Wang Chenglong 8.6 Wu Zhende 7.7 Bai Jing 7.7 Wang Yong 7.7 Zhang Dewan 6.5 Sun Yukui 6.5 Cui Yili 6.1 Cao Xueliang 5.2 Li Yuanchao 5.1 Zhou Shengrui 4.7 Xu Xijian 4.5 Tong Qunfeng 4.5 Xiao Shenwei 4.3 Zhang Yale 3.9 Zhang Yuhang 3.7 Luan Shengde 3.0 Liu Shaofei 2.8 Liu Yinsi 2.4 Lu Kaiyi 1.6 Lin Jiaxin 1.3 Hu Xuejiao 1.0 Li Ping 0.9 Ren Wen 0.0 Ren Zhiwen 0.0 Sun Lijun 0.0 Liang Tao 0.0 Wang Shuai 0.0 Cui Xucui 0.0 Xie Zheng

1 0

review star 2020-09-29
by Wu Fengguang 29 Sep '20

29 Sep '20

Yuchuan is our review star, thanks Yuchuan! wfg@crystal ~/todo% bin/review-star Review email records in the last 7 days total review paragraph point people 401 212 425 75 Wu Fengguang 129 23 56 27 Tong Qunfeng 28 17 52 12 Shi Zhichao 49 22 43 24 Du Kaitian 67 14 41 10 Yu Chuan 28 18 27 7 Xu Xijian 41 12 21 7 Xiao Shenwei 24 14 20 5 Wei Jihui 21 11 20 6 Li Yuanchao 20 10 15 0 Zhang Yu 8 8 14 2 Sun Yukui 32 10 14 1 Liu Yinsi 54 5 11 3 Hu Xuejiao 33 4 10 1 Cao Xueliang 90 5 9 1 Luan Shengde 44 7 8 0 Wu Zhende 13 5 7 0 Xie Zheng 116 5 7 0 Ren Wen 13 7 7 0 Wang Yong 9 3 6 3 Zhou Shengrui 17 3 6 0 Liu Shaofei 69 1 5 1 Lu Weitao 67 1 5 3 Zhang Yuhang 20 3 3 1 Zhang Yale 29 1 3 1 Li Ping 30 1 2 6 Cui Yili 15 6 2 2 Lu Kaiyi 13 1 1 0 Lin Jiaxin 29 1 1 0 Wang Chenglong 1 0 0 0 Liang Tao 8 0 0 0 Zhang Dewan 22 3 0 1 Bai Jing

1 0

help star 2020-09-18
by Wu Fengguang 29 Sep '20

29 Sep '20

Jihui is our help star, thanks to kind and helpful Jihui! wfg@crystal ~/todo% bin/help-star people/*/credit/2020-09-18.md 32.6 Wu Fengguang 20.1 Shi Zhichao 18.1 Wei Jihui 17.6 Xu Xijian 15.1 Bai Jing 13.4 Yu Chuan 12.2 Zhang Dewan 11.8 Lu Weitao 10.4 Tong Qunfeng 9.8 Xiao Shenwei 9.6 Cui Yili 9.0 Liu Shaofei 8.5 Du Kaitian 8.4 Liu Yinsi 7.7 Zhang Yu 7.5 Wu Zhende 7.3 Wang Yong 7.1 Cao Xueliang 6.9 Sun Yukui 6.6 Hu Xuejiao 6.5 Wang Chenglong 6.1 Li Yuanchao 5.8 Zhou Shengrui 4.7 Lin Jiaxin 3.6 Liang Tao 3.5 Luan Shengde 3.1 Lu Kaiyi 2.5 Zhang Yale 1.4 Lu Shengde 1.2 Ren Wen 1.1 Zhang Yuhang 0.8 Li Ping 0.0 Ren Zhiwen 0.0 Sun Lijun 0.0 Wang Shuai 0.0 Cui Xucui 0.0 Xie Zheng

1 0

git count 2020-09-29
by Wu Fengguang 29 Sep '20

29 Sep '20

Renwen is code star of the week, thanks Renwen! wfg@crystal ~/todo% bin/git-count 11 40 Ren Wen 18 Wu Fengguang 12 Lu Weitao 11 Wu Zhende 10 Hu Xuejiao 8 Zhang Yuhang 7 Cao Xueliang 7 Liu Yinsi 7 Xiao Shenwei 6 Yu Chuan 5 Bai Jing 5 Zhang Yu 4 Xu Xijian 4 Wei Jihui 4 Cui Yili 4 Wang Yong 4 Li Yuanchao 3 Wang Chenglong 3 Luan Shengde 3 Lin Jiaxin 3 Xie Zheng 2 Zhang Yale 2 Li Ping 2 Lu Kaiyi 1 Du Kaitian 1 Liu Shaofei 1 Liang Tao 1 Zhang Dewan 0 chief 0 Ren Zhiwen 0 Sun Lijun 0 Sun Yukui 0 Shi Zhichao 0 Zhou Shengrui

1 0

[PATCH v2 compass-ci] sparrow/0-package: delete the repeate install package
by Zhang Yu 29 Sep '20

29 Sep '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- sparrow/0-package/os/debian | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sparrow/0-package/os/debian b/sparrow/0-package/os/debian index 8301500..ef90e50 100755 --- a/sparrow/0-package/os/debian +++ b/sparrow/0-package/os/debian @@ -13,11 +13,10 @@ pkgs=( docker.io ruby-full ruby-dev - bridge-utils qemu + bridge-utils dmidecode lockfile-progs - bridge-utils ) apt-get install -y "${pkgs[@]}" -- 2.23.0

3 2

[PATCH compass-ci] git_mirror: feat: reload fork_info when /upstream-repos update
by Li Yuanchao 29 Sep '20

29 Sep '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- lib/git_mirror.rb | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index ad27880..88a94ac 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -147,6 +147,8 @@ class MirrorMain end def send_message(feedback_info) + feedback_info.merge!(@git_info[feedback_info[:git_repo]]) + feedback_info.delete(:cur_refs) message = feedback_info.to_json @message_queue.publish(message) end @@ -158,12 +160,12 @@ class MirrorMain @fork_stat[feedback_info[:git_repo]][:queued] = false return unless feedback_info[:possible_new_refs] + return reload_fork_info if feedback_info[:git_repo] == 'upstream-repos/upstream-repos' + new_refs = check_new_refs(feedback_info[:git_repo]) return if new_refs[:heads].empty? feedback_info[:new_refs] = new_refs - feedback_info.merge!(@git_info[feedback_info[:git_repo]]) - feedback_info.delete(:cur_refs) send_message(feedback_info) end @@ -219,4 +221,27 @@ class MirrorMain @git_info[git_repo][:cur_refs] = cur_refs return new_refs end + + def reload_fork_info + upstream_repos = 'upstream-repos/upstream-repos' + if @git_info[upstream_repos][:cur_refs].empty? + @git_info[upstream_repos][:cur_refs] = get_cur_refs(upstream_repos) + else + old_commit = @git_info[upstream_repos][:cur_refs][:heads]['refs/heads/master'] + new_refs = check_new_refs(upstream_repos) + new_commit = new_refs[:heads]['refs/heads/master'] + changed_files = %x(git -C /srv/git/#{upstream_repos}.git diff --name-only #{old_commit}...#{new_commit}) + reload(changed_files) + end + end + + def reload(file_list) + system("git -C #{REPO_DIR} pull") + file_list.each_line do |file| + next if File.basename(file) == '.ignore' + + repo_dir = "#{REPO_DIR}/#{file}" + load_repo_file(repo_dir, File.dirname(file), File.basename(file)) if File.file?(repo_dir) + end + end end -- 2.23.0

2 1

[PATCH v4 compass-ci] fix: sched: submit idle jobs
by Ren Wen 29 Sep '20

29 Sep '20

1) add field 'idle_job' for idle jobs, value is always 'true'. 2) add two fields 'FLUENTD_SERVER_*' for monitoring logs of virtual machines started by physical machine. Signed-off-by: Ren Wen <15991987063(a)163.com> --- src/lib/sched.cr | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index 15f5c9e..309df04 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -468,9 +468,16 @@ class Sched def auto_submit_idle_job(tbox_group) full_path_patterns = "#{ENV["CCI_REPOS"]}/lab-#{ENV["lab"]}/allot/idle/#{tbox_group}/*.yaml" + extra_job_fields = [ + "idle_job=true", + "FLUENTD_SERVER_HOST=#{ENV["FLUENTD_SERVER_HOST"]}", + "FLUENTD_SERVER_PORT=#{ENV["FLUENTD_SERVER_PORT"]}", + ] + Jobfile::Operate.auto_submit_job( full_path_patterns, - "testbox: #{tbox_group}") if Dir.glob(full_path_patterns).size > 0 + "testbox: #{tbox_group}", + extra_job_fields) if Dir.glob(full_path_patterns).size > 0 end private def add_kernel_console_param(arch_tmp) @@ -520,7 +527,7 @@ class Sched "#{JobHelper.service_path("#{SRV_INITRD}/osimage/#{job.os_dir}/vmlinuz")}" else response += "kernel #{os_http_prefix}" + - "#{JobHelper.service_path("#{SRV_OS}/#{job.os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{SRV_OS}/#{job.os_dir}/vmlinuz")}" end response += " user=lkp" response += " job=/lkp/scheduled/job.yaml RESULT_ROOT=/result/job rootovl ip=dhcp ro" -- 2.23.0

1 0