- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests] spec/submit_spec.rb: change spec describe
by Wei Jihui 09 Dec '20

09 Dec '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 77b64a7a..827c926e 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -35,7 +35,7 @@ def submit_job() end describe 'submit job spec' do - it 'link jobs spec' do + it 'spec for submit/*/job.yaml' do submit_job() end end -- 2.23.0

1 0

[PATCH lkp-tests] tests/build-pkg: fix incorrect URL address
by Liu Shaofei 09 Dec '20

09 Dec '20

==> Retrieving sources... ==> ERROR: //172.168.131.113 is not a clone of git://172.168.131.113/ Aborting... Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- tests/build-pkg | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/build-pkg b/tests/build-pkg index 17157771..8a138055 100755 --- a/tests/build-pkg +++ b/tests/build-pkg @@ -106,7 +106,9 @@ replace_source() for url in ${source[@]} do echo "$url" | egrep 'git\+|\.git$' && { - url="\"${repo_dir}git://${LKP_SERVER}/${upstream_repo}#commit=${upstream_commit}\"" + [ -n "$repo_dir" ] && { + url="\"${repo_dir}git://${LKP_SERVER}/${upstream_repo}#commit=${upstream_commit}\"" + } } url=$(echo "$url" | sed 's|https://|http://|g') -- 2.23.0

1 0

[PATCH v2 lkp-tests] lkp-tests/tests: add rpmbuild-pkg to build RPM
by Zhang Yale 09 Dec '20

09 Dec '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- tests/rpmbuild-pkg | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 tests/rpmbuild-pkg diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg new file mode 100755 index 00000000..d70b7c94 --- /dev/null +++ b/tests/rpmbuild-pkg @@ -0,0 +1,66 @@ +#!/bin/bash +# - rpm_repo + +. $LKP_SRC/lib/debug.sh +. $LKP_SRC/lib/upload.sh + +check_vars() +{ + [ -n "$rpm_repo" ] || die "rpm_repo is empty" +} + +benchmark=${rpm_repo##*/} + +RPM_MNT=/initrd/rpmbuild-pkg +mkdir -p "$RPM_MNT" +pack_to=${os_mount}/${os}/${os_arch}/${os_version}/${benchmark} +sync_dest="$RPM_MNT/$pack_to" + +rpmdev-setuptree # generate workspace in $HOME + +get_pkgfile() +{ + curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ + -d '{"git_repo": "'${rpm_repo}'", "git_command": ["git-show", "HEAD:'$1'"]}' -o "${2}" +} + +request_pkg() +{ + filelist=$(curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ + -d '{"git_repo": "'${rpm_repo}'", "git_command": ["git-ls-files", "."]}') + + local dir="SOURCES" + for pkgfile in ${filelist[*]} + do + echo $pkgfile | egrep "\.spec$" && { + dir="SPECS" + } + get_pkgfile "$pkgfile" "${HOME}/rpmbuild/${dir}/$pkgfile" + done +} + +rpmbuild_pkg() +{ + spec_dir=$HOME/rpmbuild/SPECS/$benchmark.spec + #sed -i 's/^$Source[^ ]*:[ \t]*$https/\1http/g' `grep http -rl $benchmark.spec` + # Install build depends + yum-builddep -y $spec_dir + # Download tar.gz to default path $HOME/rpmbuild/SOURCE + spectool -g -R $spec_dir + # Building rpm or srpm packages + rpmbuild -ba $spec_dir +} + +upload_pkg() +{ + #rpm package will be generated in "$HOME/rpmbuild/SRPMS" and "$HOME/rpmbuild/RPMS" + for file in $(find $HOME/rpmbuild/ -type f -name "*.rpm") + do + upload_one_curl ${file} ${sync_dest} + done +} + +check_vars +request_pkg +rpmbuild_pkg +upload_pkg -- 2.23.0

3 4

[PATCH compass-ci] delimiter: use lkp-tests to upload bisect.log
by Cao Xueliang 09 Dec '20

09 Dec '20

We create a file and put it in "/tmp/lkp/result" dir, the lkp-tests will upload the file when finished the job. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 1 + src/delimiter/constants.rb | 2 ++ src/delimiter/utils.rb | 10 ++-------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index 7543646..b54be4d 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -81,6 +81,7 @@ class GitBisect if temp[0].include? 'Bisecting' result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} "#{@error_id}" #{@work_dir}` end + Utils.create_bisect_log(@work_dir) FileUtils.rm_r(@work_dir) if Dir.exist?(@work_dir) puts "\nbisect result: #{result}" analyse_result(result) diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 5e5406f..7097c6f 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -11,3 +11,5 @@ TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" RESULT_WEBDAV_URL = ENV['RESULT_WEBDAV_URL'] || "http://172.17.0.1:3080" +# The files which are in this dir can be uploaded by lkp-tests +TMP_RESULT_ROOT = '/tmp/lkp/result' diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 60b64a1..b60ada0 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -122,18 +122,12 @@ module Utils return bisect_log_arr end - def create_bisect_log(job_id, git_dir) - log_file = File.join(git_dir, "#{job_id}_bisect.log") + def create_bisect_log(git_dir) + log_file = File.join(TMP_RESULT_ROOT, "bisect.log") log_content = parse_bisect_log(git_dir) File.open(log_file, 'w') do |f| log_content.each { |line| f.puts(line) } end - - return log_file - end - - def upload_bisect_log(log_file, dest_dir, access_key) - %x(curl -sSf -T "#{log_file}" #{RESULT_WEBDAV_URL}/#{dest_dir} --cookie "ACCESSKEY=#{access_key}") end end end -- 2.23.0

1 1

[PATCH v1 compass-ci] delimiter: use lkp-tests to upload bisect.log
by Cao Xueliang 09 Dec '20

09 Dec '20

We create a file and put it in "/tmp/lkp/result" dir, the lkp-tests will upload the file when finished the job. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 1 + src/delimiter/constants.rb | 3 ++- src/delimiter/utils.rb | 10 ++-------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index 7543646..b54be4d 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -81,6 +81,7 @@ class GitBisect if temp[0].include? 'Bisecting' result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} "#{@error_id}" #{@work_dir}` end + Utils.create_bisect_log(@work_dir) FileUtils.rm_r(@work_dir) if Dir.exist?(@work_dir) puts "\nbisect result: #{result}" analyse_result(result) diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 5e5406f..c243df5 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -10,4 +10,5 @@ DELIMITER_ACCONUT = ENV['DELIMITER_ACCONUT'] || 'compass-ci(a)qq.com' TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" -RESULT_WEBDAV_URL = ENV['RESULT_WEBDAV_URL'] || "http://172.17.0.1:3080" +# The files which are in this dir can be uploaded by lkp-tests +TMP_RESULT_ROOT = ENV['TMP_RESULT_ROOT'] || '/tmp/lkp/result' diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb index 60b64a1..b60ada0 100644 --- a/src/delimiter/utils.rb +++ b/src/delimiter/utils.rb @@ -122,18 +122,12 @@ module Utils return bisect_log_arr end - def create_bisect_log(job_id, git_dir) - log_file = File.join(git_dir, "#{job_id}_bisect.log") + def create_bisect_log(git_dir) + log_file = File.join(TMP_RESULT_ROOT, "bisect.log") log_content = parse_bisect_log(git_dir) File.open(log_file, 'w') do |f| log_content.each { |line| f.puts(line) } end - - return log_file - end - - def upload_bisect_log(log_file, dest_dir, access_key) - %x(curl -sSf -T "#{log_file}" #{RESULT_WEBDAV_URL}/#{dest_dir} --cookie "ACCESSKEY=#{access_key}") end end end -- 2.23.0

1 0

[PATCH v2 lkp-tests] lkp-tests/jobs: add rpmbuild-pkg.yaml to build rpm package
by Zhang Yale 09 Dec '20

09 Dec '20

Usage example: suite: rpmbuild-pkg category: functional rpm_repo: rpmbuild-pkg/2ping rpmbuild-pkg: Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/rpmbuild-pkg.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 jobs/rpmbuild-pkg.yaml diff --git a/jobs/rpmbuild-pkg.yaml b/jobs/rpmbuild-pkg.yaml new file mode 100644 index 00000000..8b5fc39b --- /dev/null +++ b/jobs/rpmbuild-pkg.yaml @@ -0,0 +1,6 @@ +suite: rpmbuild-pkg +category: functional + +rpm_repo: + +rpmbuild-pkg: -- 2.23.0

1 0

[PATCH lkp-tests] lkp-tests/jobs: add rpmbuild-pkg.yaml to build rpm package
by Zhang Yale 09 Dec '20

09 Dec '20

Usage exapmle: suite: rpmbuild-pkg category: functional rpm_spec: rpmbuild-pkg/2ping rpmbuild-pkg: benchmark: 2ping Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> --- jobs/rpmbuild-pkg.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 jobs/rpmbuild-pkg.yaml diff --git a/jobs/rpmbuild-pkg.yaml b/jobs/rpmbuild-pkg.yaml new file mode 100644 index 00000000..545ce6ef --- /dev/null +++ b/jobs/rpmbuild-pkg.yaml @@ -0,0 +1,6 @@ +suite: rpmbuild-pkg +category: functional + +rpm_spec: +rpmbuild-pkg: + benchmark: -- 2.23.0

1 1

[PATCH compass-ci 5/5] container/srv-http: turn off statistic folder size function
by Lu Weitao 09 Dec '20

09 Dec '20

[Why] When the folder is larger, the web page response is slower Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/srv-http/root/srv/_h5ai/private/conf/options.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/srv-http/root/srv/_h5ai/private/conf/options.json b/container/srv-http/root/srv/_h5ai/private/conf/options.json index 69a7add..5d922da 100755 --- a/container/srv-http/root/srv/_h5ai/private/conf/options.json +++ b/container/srv-http/root/srv/_h5ai/private/conf/options.json @@ -158,7 +158,7 @@ - type: string, "php" (sloooow) or "shell-du" (sloow) */ "foldersize": { - "enabled": true, + "enabled": false, "type": "php" }, -- 2.23.0

1 0

[PATCH compass-ci 4/5] container/srv-http: fix can not display image
by Lu Weitao 09 Dec '20

09 Dec '20

[Why] Haven't define images relationship in mime.types Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/srv-http/root/etc/nginx/mime.types | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/container/srv-http/root/etc/nginx/mime.types b/container/srv-http/root/etc/nginx/mime.types index a4ee74b..a8f7b0c 100644 --- a/container/srv-http/root/etc/nginx/mime.types +++ b/container/srv-http/root/etc/nginx/mime.types @@ -6,6 +6,17 @@ types { text/yaml yaml; text/plain txt time data sh log; + image/gif gif; + image/jpeg jpeg jpg; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + application/json json; application/x-gzip gz tgz cgz; } -- 2.23.0

1 0

[PATCH compass-ci 3/5] container/srv-http: config php-fpm user
by Lu Weitao 09 Dec '20

09 Dec '20

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- container/srv-http/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container/srv-http/Dockerfile b/container/srv-http/Dockerfile index 2821e57..8f9a36d 100644 --- a/container/srv-http/Dockerfile +++ b/container/srv-http/Dockerfile @@ -7,5 +7,9 @@ ADD root / RUN apk add --no-cache php7 php7-fpm php7-session php7-json php7-exif php7-imagick php7-gd php7-fileinfo RUN sed -i '/\[global\]/a daemonize = no' /etc/php7/php-fpm.conf +RUN sed -i "s/user = nobody/user = nginx/g" /etc/php7/php-fpm.d/www.conf +RUN sed -i "s/group = nobody/group = nginx/g" /etc/php7/php-fpm.d/www.conf + +RUN chown -R nginx:nginx /srv/_h5ai ENTRYPOINT ["/sbin/entrypoint.sh"] -- 2.23.0

1 0