- Compass-ci - mailweb.openeuler.org

[PATCH v5 compass-ci 4/6] fetch-mail: Dockerfile
by Luan Shengde 17 Dec '20

17 Dec '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/fetch-mail/Dockerfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 container/fetch-mail/Dockerfile diff --git a/container/fetch-mail/Dockerfile b/container/fetch-mail/Dockerfile new file mode 100644 index 0000000..0434e09 --- /dev/null +++ b/container/fetch-mail/Dockerfile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:latest +MAINTAINER Luan Shengde <shdluan(a)163.com> +ENV DEBIAN_FRONTEND noninteractive + +RUN useradd -u 1144 -g 1147 mailer +RUN yum update -y +RUN yum install -y procmail fetchmail + +COPY fetchmailrc.template /home/mailer/.fetchmailrc +COPY procmailrc.template /home/mailer/.procmailrc +COPY run.sh /home/mailer/ + +RUN chmod 600 /home/mailer/.fetchmailrc +RUN chmod 600 /home/mailer/.procmailrc +RUN chown -R mailer:mailer /home/mailer +RUN chmod +x /home/mailer/run.sh -- 2.23.0

1 0

[PATCH v5 compass-ci 3/6] fetch-mail: runner for fetch-mail service
by Luan Shengde 17 Dec '20

17 Dec '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/fetch-mail/run.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 container/fetch-mail/run.sh diff --git a/container/fetch-mail/run.sh b/container/fetch-mail/run.sh new file mode 100755 index 0000000..c79b054 --- /dev/null +++ b/container/fetch-mail/run.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +mail_conf () +{ + sed -i "s|FETCH_MAIL_ADDRESS|${FETCH_MAIL_ADDRESS}|g" '.fetchmailrc' + sed -i "s|FETCH_MAIL_AUTH_CODE|${FETCH_MAIL_AUTH_CODE}|g" '.fetchmailrc' + sed -i "s|FETCH_MAIL_DIR|${FETCH_MAIL_DIR}|g" '.procmailrc' + sed -i "s|FETCH_MAIL_BOX|${FETCH_MAIL_BOX}|g" '.procmailrc' +} + +mail_conf +fetchmail -d 100 -- 2.23.0

1 0

[PATCH v5 compass-ci 2/6] fetch-mail: config file for procmail
by Luan Shengde 17 Dec '20

17 Dec '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/fetch-mail/procmailrc.template | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 container/fetch-mail/procmailrc.template diff --git a/container/fetch-mail/procmailrc.template b/container/fetch-mail/procmailrc.template new file mode 100644 index 0000000..9cea4bc --- /dev/null +++ b/container/fetch-mail/procmailrc.template @@ -0,0 +1,25 @@ +DROPPRIVS=yes +PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin +MAILDIR=FETCH_MAIL_DIR +MAILLIST=${MAILDIR} +DEFAULT=${MAILDIR}/FETCH_MAIL_BOX/ +ORGMAIL=${DEFAULT}/FETCH_MAIL_BOX/ +LOGFILE=${MAILDIR}/log/procmail # recommended + +UMASK=002 + +DISPLAY=:0 +XAUTHORITY=$HOME/.Xauthority + +# One often receives duplicate messages for cross-postings to mailing +# lists, or explicit replies to a post from you in addition to the +# mailing list message. +# +# The following recipe eliminates all duplicate messages. It tells +# formail(1) to keep a cache file of the Message-IDs of the most recent +# messages you've received. Since Message-IDs are guaranteed unique for +# distinct messages, they are ideally suited to weed out duplicates. + +# LOCKFILE=$MAILDIR/.msgid.lock +:0 Wh: $MAILDIR/.msgid.lock +| formail -D 655360 $MAILDIR/log/msgid -- 2.23.0

1 0

[PATCH v5 compass-ci 1/6] fetch-mail: config file for fetchmail
by Luan Shengde 17 Dec '20

17 Dec '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/fetch-mail/fetchmailrc.template | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 container/fetch-mail/fetchmailrc.template diff --git a/container/fetch-mail/fetchmailrc.template b/container/fetch-mail/fetchmailrc.template new file mode 100644 index 0000000..8c7e82b --- /dev/null +++ b/container/fetch-mail/fetchmailrc.template @@ -0,0 +1,5 @@ +poll imap.qq.com with proto IMAP +username "FETCH_MAIL_ADDRESS" +password "FETCH_MAIL_AUTH_CODE" +mda "/usr/bin/procmail -f %F -d %T" +nokeep -- 2.23.0

1 0

[PATCH lkp-tests] daemon: add the local execution permission to the script
by Hu Xuejiao 17 Dec '20

17 Dec '20

Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- daemon/multi-docker | 2 +- daemon/multi-qemu | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/multi-docker b/daemon/multi-docker index b39506b6..49c8c968 100755 --- a/daemon/multi-docker +++ b/daemon/multi-docker @@ -8,7 +8,7 @@ multi_docker() { - export CCI_SRC=/c/compass-ci + [ -n "$CCI_SRC" ] || export CCI_SRC=/c/compass-ci local hostname=$tbox_group.$HOSTNAME $CCI_SRC/providers/multi-docker -n $hostname -c $nr_container -q $queues } diff --git a/daemon/multi-qemu b/daemon/multi-qemu index aa2348b4..99f63583 100755 --- a/daemon/multi-qemu +++ b/daemon/multi-qemu @@ -10,9 +10,9 @@ multi_qemu() { - export CCI_SRC=/c/compass-ci + [ -n "$CCI_SRC" ] || export CCI_SRC=~/compass-ci local hostname=$tbox_group.$HOSTNAME - + cd "$CACHE_DIR" $CCI_SRC/providers/multi-qemu -n "$hostname" -c "$nr_vm" -q "$queues" } -- 2.23.0

4 3

[PATCH v2 compass-ci] git_mirror.rb: improve how to get filenames
by Ren Wen 17 Dec '20

17 Dec '20

Dir.children returns filenames except for “.” and “..”. Signed-off-by: Ren Wen <15991987063(a)163.com> --- lib/git_mirror.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git_mirror.rb b/lib/git_mirror.rb index 389b185..156d5bb 100644 --- a/lib/git_mirror.rb +++ b/lib/git_mirror.rb @@ -128,7 +128,7 @@ class MirrorMain def traverse_repodir(repodir) if File.directory? repodir load_defaults(repodir) - entry_list = Dir.entries(repodir) - Array['.', '..', 'DEFAULTS', '.ignore', '.git'] + entry_list = Dir.children(repodir) - ['DEFAULTS'] entry_list.each do |entry| next if entry.start_with? '.' -- 2.23.0

1 0

[PATCH compass-ci] container/srv-http: import h5ai into container
by Lu Weitao 17 Dec '20

17 Dec '20

[Why] Optimize result page style to make it more modern Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/srv-http/build | 17 +++++++++++++++++ .../srv-http/root/etc/nginx/conf.d/default.conf | 5 ++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/container/srv-http/build b/container/srv-http/build index 3a500ea..6580c55 100755 --- a/container/srv-http/build +++ b/container/srv-http/build @@ -2,4 +2,21 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +[[ $H5AI_SRC ]] || H5AI_SRC=/c/h5ai + +WORKSPACE=$(dirname $(realpath $0)) + +# npm build h5ai package +cd $H5AI_SRC +npm install +npm run build + +# add h5ai package in ./root/srv to add it into image +cd $WORKSPACE +mkdir ./root/srv +cp -r $H5AI_SRC/build/_h5ai ./root/srv + docker build -t srv-http . + +# clean h5ai package +rm -rf ./root/srv diff --git a/container/srv-http/root/etc/nginx/conf.d/default.conf b/container/srv-http/root/etc/nginx/conf.d/default.conf index 676418a..646eee3 100644 --- a/container/srv-http/root/etc/nginx/conf.d/default.conf +++ b/container/srv-http/root/etc/nginx/conf.d/default.conf @@ -3,8 +3,8 @@ server { server_name "srv-http"; server_tokens off; - root /usr/share/nginx/html; - index index.html; + root /srv; + index index.html index.php /_h5ai/public/index.php; charset utf-8,gbk; @@ -24,7 +24,6 @@ server { autoindex on; autoindex_localtime on; allow all; - root /srv; location ~* /[-_a-z]+$ { add_header Content-Type text/plain; } -- 2.23.0

1 1

[PATCH compass-ci] providers: mount "/srv/result" for docker
by Cao Xueliang 17 Dec '20

17 Dec '20

Now use mount "/srv/result" to get error messages for bisect job by container, next will get the error messages from the assistant container API. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- providers/docker/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/providers/docker/run.sh b/providers/docker/run.sh index d532a56..127cf5b 100755 --- a/providers/docker/run.sh +++ b/providers/docker/run.sh @@ -29,6 +29,7 @@ cmd=( -v ${DIR}/bin:/root/bin:ro -v $CCI_SRC:/c/compass-ci -v /srv/git:/srv/git:ro + -v /srv/result:/srv/result:ro -v ${busybox_path}:/usr/local/bin/busybox --oom-score-adj="-1000" ${docker_image} -- 2.23.0

1 0

[PATCH compass-ci] code-spec.md: adjust markdown document format
by Xu Xijian 17 Dec '20

17 Dec '20

In markdown documents, text for bash should be contained in block as belows: ```SHELL content SHELL Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- doc/code-spec.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/code-spec.md b/doc/code-spec.md index d44c6fe..a717f64 100644 --- a/doc/code-spec.md +++ b/doc/code-spec.md @@ -21,10 +21,12 @@ code注意事项 - puts/printf字符串应当容易搜索(grep)。特别注意包含足够长的固定内容substring. 例如： +```SHELL die "test yaml$${test_yaml}$ not exist in ${LKP_SRC}/jobs !!!" ==> die "cannot find test yaml ($test_yaml) in $LKP_SRC/jobs" ^^^^^^^^^^^^^^^^^^^^^ grep-friendly fixed substring +``` 重构友好编码 ============ -- 2.23.0

2 2

[PATCH compass-ci] lib: add the add_task function to taskqueue client
by Cao Xueliang 17 Dec '20

17 Dec '20

1. Modify the default host to 172.17.0.1. 2. Add the add_task function to taskqueue client. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/taskqueue_client.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/taskqueue_client.rb b/lib/taskqueue_client.rb index 91b72dc..2c22990 100644 --- a/lib/taskqueue_client.rb +++ b/lib/taskqueue_client.rb @@ -6,7 +6,7 @@ require 'rest-client' # taskqueue client class TaskQueueClient - HOST = (ENV.key?('TASKQUEUE_HOST') ? ENV['TASKQUEUE_HOST'] : '127.0.0.1') + HOST = (ENV.key?('TASKQUEUE_HOST') ? ENV['TASKQUEUE_HOST'] : '172.17.0.1') PORT = (ENV.key?('TASKQUEUE_PORT') ? ENV['TASKQUEUE_PORT'] : 3060).to_i def initialize(host = HOST, port = PORT) @host = host @@ -20,4 +20,14 @@ class TaskQueueClient url: url ) end + + def add_task(queue_path, json_data) + url = "http://#{@host}:#{@port}/add?queue=#{queue_path}" + RestClient::Request.execute( + method: :post, + url: url, + payload: json_data, + headers: { content_type: 'application/json' } + ) + end end -- 2.23.0

1 0