- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] pkg/mysql/PKGBUILD: fix md5sums
by Lin Jiaxin 19 Apr '21

19 Apr '21

reference: commit bc02d3fe0c13cf85d561a26fdef8dd04c8ede4aa Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- pkg/mysql/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/mysql/PKGBUILD b/pkg/mysql/PKGBUILD index 304f6a4a6..c13f07d67 100644 --- a/pkg/mysql/PKGBUILD +++ b/pkg/mysql/PKGBUILD @@ -9,7 +9,7 @@ source=("https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-$pkgver.tar.gz" "https://mirrors.huaweicloud.com/kunpeng/archive/openEuler/patch/database/my…" "https://github.com/thkukuk/rpcsvc-proto/releases/download/v1.4/rpcsvc-proto…" "my.cnf") -md5sums=('7472a25d91973cbba5d8a8f176a3080b' '6e853850efbd6f887ac3e13b1bf99cc4' 'f13eb11de53616017f7428cc06d4e242' 'df1022ccc5d0aff30b8e505735b4a98b' '1390631a1ea1832f9c27d07fcc1e536e') +md5sums=('7472a25d91973cbba5d8a8f176a3080b' '6e853850efbd6f887ac3e13b1bf99cc4' 'f13eb11de53616017f7428cc06d4e242' 'df1022ccc5d0aff30b8e505735b4a98b' 'd90ba2c701507eeac43b06fcfa49c2c1') prepare() { -- 2.23.0

1 0

[PATCH compass-ci] es_query.rb: fix _scroll_id change
by Cui Yili 19 Apr '21

19 Apr '21

[why] _scroll_id will change every time query, so you need to save the last _scroll_id. Signed-off-by: Cui Yili <2268260388(a)qq.com> --- lib/es_query.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/es_query.rb b/lib/es_query.rb index 22d68a9..6bd39bf 100644 --- a/lib/es_query.rb +++ b/lib/es_query.rb @@ -47,11 +47,12 @@ class ESQuery }, size: size } result = @client.search index: @index, scroll: '10m', body: query - @scroll_id = result['_scroll_id'] - return result else - @client.scroll scroll: '10m', scroll_id: @scroll_id + result = @client.scroll scroll: '10m', scroll_id: @scroll_id end + + @scroll_id = result['_scroll_id'] unless result.empty? + return result end def query_by_id(id) -- 2.23.0

2 1

[PATCH compass-ci] sbin/auto_submit: add author_email and committer_email
by Li Yuanchao 19 Apr '21

19 Apr '21

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- sbin/auto_submit | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/auto_submit b/sbin/auto_submit index faebb2f..4adce89 100755 --- a/sbin/auto_submit +++ b/sbin/auto_submit @@ -55,6 +55,9 @@ class AutoSubmit real_argvs.push("upstream_dir=#{belong}") tag = %x(git -C #{mirror_dir} tag --points-at #{commit_id}) real_argvs.push("upstream_tag=#{tag}") unless tag.empty? + author_email = %x(git -C #{mirror_dir} log --format=%ae -1) + committer_email = %x(git -C #{mirror_dir} log --format=%ce -1) + real_argvs.push("author_email=#{author_email} committer_email=#{committer_email}") system(real_argvs.join(' ')) end -- 2.23.0

1 0

[PATCH compass-ci 2/2] scheduler: allow some variables to be used in the job
by Yu Chuan 19 Apr '21

19 Apr '21

[Why] allow two variables: - OS_HTTP_HOST - OS_HTTP_PORT Signed-off-by: Yu Chuan <13186087857(a)163.com> --- sparrow/3-code/dev-env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 76686a5f5823..969889edc16b 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -151,6 +151,8 @@ SEND_MAIL_HOST: SEND_MAIL_PORT: INITRD_HTTP_HOST: INITRD_HTTP_PORT: +OS_HTTP_HOST: +OS_HTTP_PORT: ASSIST_RESULT_HOST: ASSIST_RESULT_PORT: ASSISTANT_HOST: -- 2.23.0

1 0

[PATCH compass-ci 1/2] scheduler: allow all jobs with suite=install-iso* to use custom_ipxe
by Yu Chuan 19 Apr '21

19 Apr '21

[Why] Job with suite=install-iso-firstboot needs use custom_ipxe feature. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- src/scheduler/find_job_boot.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler/find_job_boot.cr b/src/scheduler/find_job_boot.cr index 41fa89f0056b..1ccd9e6de644 100644 --- a/src/scheduler/find_job_boot.cr +++ b/src/scheduler/find_job_boot.cr @@ -287,7 +287,7 @@ class Sched end private def get_boot_ipxe(job : Job) - return job["custom_ipxe"] if job["suite"] == "install-iso" && job.has_key?("custom_ipxe") + return job["custom_ipxe"] if job["suite"].starts_with?("install-iso") && job.has_key?("custom_ipxe") response = "#!ipxe\n\n" -- 2.23.0

1 0

[PATCH compass-ci] add permission 775 lkp:lkp
by Liu Yinsi 17 Apr '21

17 Apr '21

Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/1-storage/permission | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sparrow/1-storage/permission b/sparrow/1-storage/permission index db33a93..3c229c5 100755 --- a/sparrow/1-storage/permission +++ b/sparrow/1-storage/permission @@ -13,6 +13,9 @@ chmod_dir=( /srv/rabbitmq /c/git-repos /srv/tmp/public + /srv/initrd + /srv/initrd/pkg + /srv/initrd/deps ) chmod 775 "${chmod_dir[@]}" @@ -20,6 +23,8 @@ chmod 775 "${chmod_dir[@]}" chown_dir=( /srv/result /srv/initrd + /srv/initrd/pkg + /srv/initrd/deps /srv/es /srv/cache/netdata_cache /srv/cache/netdata_lib -- 2.23.0

1 0

[PATCH compass-ci] etcd/build: remove redundant spaces
by Wu Zhende 17 Apr '21

17 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/etcd/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/container/etcd/build b/container/etcd/build index 6ae25dd..37c2326 100755 --- a/container/etcd/build +++ b/container/etcd/build @@ -8,5 +8,3 @@ version=v3.4.15 docker_skip_rebuild "etcd-${version}:alpine" docker build -t etcd-${version}:alpine --build-arg VERSION=${version} . - - -- 2.23.0

1 0

[PATCH compass-ci] sbin/es-jobs-mapping.sh: add subqueue
by Wu Zhende 17 Apr '21

17 Apr '21

Use subqueue to search Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sbin/es-jobs-mapping.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 9926fd8..67b1ed1 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -100,6 +100,9 @@ else "queue": { "type": "keyword" }, + "subqueue": { + "type": "keyword" + }, "testbox": { "type": "keyword" }, -- 2.23.0

1 0

[PATCH compass-ci] scheduler/scheduler.cr: add warning logs
by Wu Zhende 17 Apr '21

17 Apr '21

Because set "logging false", so need to print all the logs ourselves. Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/scheduler/scheduler.cr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scheduler/scheduler.cr b/src/scheduler/scheduler.cr index ae30937..19a3092 100644 --- a/src/scheduler/scheduler.cr +++ b/src/scheduler/scheduler.cr @@ -40,11 +40,15 @@ module Scheduler env.response.headers["Connection"] = "close" env.create_log env.create_sched + rescue e + env.log.warn(e.inspect_with_backtrace) end after_all do |env| env.sched.etcd_close env.log.info(%({"from": "#{env.request.remote_address}", "message": "access_record"})) + rescue e + env.log.warn(e.inspect_with_backtrace) end # echo alive -- 2.23.0

1 0

[PATCH compass-ci] lib/dump_stat.rb: add message key in cols verifation
by Lu Weitao 17 Apr '21

17 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/dump_stat.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/dump_stat.rb b/lib/dump_stat.rb index 04a7632..a497d46 100644 --- a/lib/dump_stat.rb +++ b/lib/dump_stat.rb @@ -121,8 +121,6 @@ module DumpStat @max_cols_stat = '' zero_stats = [] @result.each do |key, val| - next if key.end_with?('.message', '.log') - if @max_cols < val.size @max_cols = val.size @max_cols_stat = key -- 2.23.0

1 0