- Compass-ci - mailweb.openeuler.org

[PATCH v2 lkp-tests 3/3] distro/depends: add nginx-server-dev
by Wei Jihui 23 Jan '21

23 Jan '21

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- distro/depends/nginx-server-dev | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 distro/depends/nginx-server-dev diff --git a/distro/depends/nginx-server-dev b/distro/depends/nginx-server-dev new file mode 100644 index 00000000..170af747 --- /dev/null +++ b/distro/depends/nginx-server-dev @@ -0,0 +1,2 @@ +pcre-devel +libpcre3-dev -- 2.23.0

1 0

[PATCH v2 lkp-tests 2/3] pkg/nginx-server: add ngixn conf
by Wei Jihui 23 Jan '21

23 Jan '21

nginx-server test need forbidden nf_conntrack when os setup Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- pkg/nginx-server/PKGBUILD | 10 ++++++++-- pkg/nginx-server/blacklist.conf | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkg/nginx-server/blacklist.conf diff --git a/pkg/nginx-server/PKGBUILD b/pkg/nginx-server/PKGBUILD index 141722e1..ac458776 100644 --- a/pkg/nginx-server/PKGBUILD +++ b/pkg/nginx-server/PKGBUILD @@ -5,8 +5,8 @@ arch=('i386' 'x86_64') url="https://nginx.org" license=('BSD') nginx_name=("nginx-${pkgver}.${pkgrel}") -source=("https://nginx.org/download/${nginx_name}.tar.gz") -md5sums=('SKIP') +source=("https://nginx.org/download/${nginx_name}.tar.gz" "blacklist.conf") +md5sums=('SKIP' 'SKIP') build() { @@ -19,6 +19,12 @@ build() package() { + mkdir -p "$pkgdir/rootfs/addon/etc/modprobe.d/" + cp blacklist.conf "$pkgdir/rootfs/addon/etc/modprobe.d/" + + mkdir -p "$pkgdir/lkp/benchmarks/${pkgname}/" + cp -r "$LKP_SRC/pkg/${pkgname}/nginx_conf" "$pkgdir/lkp/benchmarks/${pkgname}/" + cd "${srcdir}/${nginx_name}" make install DESTDIR="${pkgdir}" } diff --git a/pkg/nginx-server/blacklist.conf b/pkg/nginx-server/blacklist.conf new file mode 100644 index 00000000..e8798cc7 --- /dev/null +++ b/pkg/nginx-server/blacklist.conf @@ -0,0 +1,10 @@ +install nf_conntrack /bin/false +blacklist nf_conntrack +blacklist nf_conntrack_ipv6 +blacklist xt_conntrack +blacklist nf_conntrack_ftp +blacklist xt_state +blacklist iptable_nat +blacklist ipt_REDIRECT +blacklist nf_nat +blacklist nf_conntrack_ipv4 -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/3] pkg: rename nginx to nginx-server
by Wei Jihui 23 Jan '21

23 Jan '21

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- pkg/{nginx => nginx-server}/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) rename pkg/{nginx => nginx-server}/PKGBUILD (63%) diff --git a/pkg/nginx/PKGBUILD b/pkg/nginx-server/PKGBUILD similarity index 63% rename from pkg/nginx/PKGBUILD rename to pkg/nginx-server/PKGBUILD index 989676c4..141722e1 100644 --- a/pkg/nginx/PKGBUILD +++ b/pkg/nginx-server/PKGBUILD @@ -1,23 +1,24 @@ -pkgname=nginx +pkgname=nginx-server pkgver=1.14 pkgrel=2 arch=('i386' 'x86_64') url="https://nginx.org" license=('BSD') -source=("https://nginx.org/download/nginx-${pkgver}.${pkgrel}.tar.gz") +nginx_name=("nginx-${pkgver}.${pkgrel}") +source=("https://nginx.org/download/${nginx_name}.tar.gz") md5sums=('SKIP') build() { benchmark_path="/lkp/benchmarks/${pkgname}" mkdir -p "${benchmark_path}" - cd "${srcdir}/${pkgname}-${pkgver}.${pkgrel}" + cd "${srcdir}/${nginx_name}" ./configure --with-http_ssl_module --prefix="${benchmark_path}" make -j4 } package() { - cd "${srcdir}/${pkgname}-${pkgver}.${pkgrel}" + cd "${srcdir}/${nginx_name}" make install DESTDIR="${pkgdir}" } -- 2.23.0

1 0

[PATCH lkp-tests] bin/lkp-setup-rootfs: refactor the chmod_root_ssh()
by Xu Xijian 22 Jan '21

22 Jan '21

Add blank line after return cmd. Signed-off-by: Xu Xijian <hdxuxijian(a)163.com> --- bin/lkp-setup-rootfs | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/lkp-setup-rootfs b/bin/lkp-setup-rootfs index cf48c8f6b..bc0f04b2a 100755 --- a/bin/lkp-setup-rootfs +++ b/bin/lkp-setup-rootfs @@ -245,6 +245,7 @@ chmod_root_ssh() { [ -d "/root/.ssh" ] || return [ -f "/root/.ssh/id_rsa" ] || return + chmod 700 /root/.ssh/ chmod 600 /root/.ssh/id_rsa } -- 2.23.0

2 1

[PATCH compass-ci] sparrow/1-storage: remove mount os rootfs
by Liu Yinsi 22 Jan '21

22 Jan '21

[why] for locally deploy Compass CI with one click, we open directory /srv/os to download os rootfs, rather than open shared directory to mount. so remove it. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/1-storage/tiny | 3 --- 1 file changed, 3 deletions(-) diff --git a/sparrow/1-storage/tiny b/sparrow/1-storage/tiny index eb7270d..e589937 100755 --- a/sparrow/1-storage/tiny +++ b/sparrow/1-storage/tiny @@ -26,6 +26,3 @@ dirs=( ) mkdir -p "${dirs[@]}" - -mount -t cifs //$LKP_SERVER/os /srv/os -o guest,ro,hard,vers=1.0,noacl,nouser_xattr -mount -t cifs //$LKP_SERVER/initrd /srv/initrd -o port=446,guest,ro,hard,vers=1.0,noacl,nouser_xattr -- 2.23.0

1 0

[PATCH lkp-tests 2/2] tests/deploy-cci: mount os rootfs
by Liu Yinsi 22 Jan '21

22 Jan '21

[why] mount our server's os rootfs directory is a dedicated way for $LKP_SRC/test/deploy-cci, it is not a general way for deploy Compass CI with one click, put it in tests/deploy-cci more reasonable, not in $CCI_SRC/sparrow script. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- tests/deploy-cci | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/deploy-cci b/tests/deploy-cci index 8e6acbac4..e2a7bd320 100755 --- a/tests/deploy-cci +++ b/tests/deploy-cci @@ -35,5 +35,13 @@ deploy() ./install-tiny } +mount_rootfs() +{ + mkdir -p /srv/{os,initrd} + mount -t cifs //$LKP_SERVER/os /srv/os -o guest,ro,hard,vers=1.0,noacl,nouser_xattr + mount -t cifs //$LKP_SERVER/initrd /srv/initrd -o port=446,guest,ro,hard,vers=1.0,noacl,nouser_xattr +} + export_env +mount_rootfs deploy -- 2.23.0

1 0

[PATCH lkp-tests 1/2] distro/depends: fix failed to mount
by Liu Yinsi 22 Jan '21

22 Jan '21

[error] root@test-lys /c/compass-ci/container/os-cifs# mount -t cifs //$LKP_SERVER/os /srv/os -o guest,ro,hard,vers=1.0,noacl,nouser_xattr mount: /srv: bad option; for several filesystems (e.g. nfs, cifs) you might need a /sbin/mount.<type> helper program. [why] missing depends cifs-utils causes mount error Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- distro/depends/deploy-cci | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/depends/deploy-cci b/distro/depends/deploy-cci index 5664e303b..c0d6a5310 100644 --- a/distro/depends/deploy-cci +++ b/distro/depends/deploy-cci @@ -1 +1,2 @@ git +cifs-utils -- 2.23.0

1 0

[PATCH compass-ci 2/2] lib/compare_error_messages.rb: return false when matching error filename failed
by Lin Jiaxin 22 Jan '21

22 Jan '21

If error_id = 'build-pkg.c++:fatal-error:switch'~x16~xe6~xab~xaa'does-not-start-with'-'', cannot get the error filename and return an empty hash. The empty hash is not credible too. Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- lib/compare_error_messages.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/compare_error_messages.rb b/lib/compare_error_messages.rb index 2e35019..5f74be7 100644 --- a/lib/compare_error_messages.rb +++ b/lib/compare_error_messages.rb @@ -17,7 +17,9 @@ def credible?(previous_job_id, later_job_id, error_id) previous_result_file = File.join('/srv', es.query_by_id(previous_job_id)['result_root'], 'build-pkg') later_result_file = File.join('/srv', es.query_by_id(later_job_id)['result_root'], 'build-pkg') - return false if filenames_check(previous_result_file, later_result_file, error_id).value?(false) + filenames_check = filenames_check(previous_result_file, later_result_file, error_id) + + return false if filenames_check.empty? || filenames_check.value?(false) return true end -- 2.23.0

1 0

[PATCH compass-ci 1/2] lib/compare_error_messages.rb: remove filename extension when matching error filename
by Lin Jiaxin 22 Jan '21

22 Jan '21

Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- lib/compare_error_messages.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/compare_error_messages.rb b/lib/compare_error_messages.rb index 92533b8..2e35019 100644 --- a/lib/compare_error_messages.rb +++ b/lib/compare_error_messages.rb @@ -28,8 +28,8 @@ def filenames_check(previous_result_file, later_result_file, error_id) error_lines = ErrorMessages.new(previous_result_file).obtain_error_messages_by_error_id(error_id, true) error_lines.each do |error_line| - # "src/ssl_sock.c:1454:104: warning: unused parameter 'al' [-Wunused-parameter]" => "src/ssl_sock.c" - filenames << $1 if error_line =~ /(.*)(:\d+){2}: (error|warning):/ + # "src/ssl_sock.c:1454:104: warning: unused parameter 'al' [-Wunused-parameter]" => "src/ssl_sock" + filenames << $1.chomp(File.extname($1)) if error_line =~ /(.*)(:\d+){2}: (error|warning):/ end File.open(later_result_file).each_line do |line| -- 2.23.0

1 0

[PATCH v2 compass-ci] src/lib/job: add check runtime upper limit
by Luan Shengde 22 Jan '21

22 Jan '21

add limit for borrowing machine: runtime <= 10 days the job will break up if the value of runtime in the job yaml is greater than 10 days Signed-off-by: Luan Shengde <shdluan(a)163.com> --- src/lib/job.cr | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/lib/job.cr b/src/lib/job.cr index 9b52d88..bb9b792 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -64,6 +64,7 @@ class Job return unless @hash.has_key?("my_uuid") || @hash.has_key?("my_token") check_account_info() + check_run_time() set_sshr_info() return end @@ -410,6 +411,15 @@ class Job @hash.delete("my_token") end + private def check_run_time + return unless @hash["testcase"] == "borrow" + + max_run_time = 10 * 24 * 3600 + + error_msg = "The maximum runtime should no more than 10 days." + raise error_msg if hash["runtime"].to_i > max_run_time + end + private def is_valid_account?(account_info) return false unless account_info.is_a?(JSON::Any) -- 2.23.0

1 0