April 2021 - Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 2/3] sbin/mail-job: mail compare result to author and committer
by Lu Weitao 24 Apr '21

24 Apr '21

Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/mail_job_result.rb | 55 +++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/lib/mail_job_result.rb b/lib/mail_job_result.rb index e5884705..752b8dcf 100644 --- a/lib/mail_job_result.rb +++ b/lib/mail_job_result.rb @@ -4,6 +4,7 @@ require_relative 'mail_client.rb' require_relative 'es_query.rb' +require_relative 'compare.rb' require_relative 'constants.rb' require 'json' @@ -16,27 +17,44 @@ class MailJobResult end def send_mail - json = compose_mail.to_json - MailClient.new.send_mail(json) + data = compose_mail + return nil unless data + MailClient.new.send_mail_encode(data) end def compose_mail set_submitter_info - subject = "[Compass-CI] job: #{@job_id} result" + context = get_compare_result(@job) + return nil unless context + + subject = "[Compass-CI] job: #{@job_id} compare result" signature = "Regards\nCompass-CI\nhttps://gitee.com/openeuler/compass-ci" - body = "Hi, - Thanks for your participation in Kunpeng and software ecosystem! + + data = <<~BODY + To: #{@email_to} + Bcc: #{@email_cc} + Subject: #{subject} + + Hi, + + html_part: Thanks for your participation in Kunpeng and software ecosystem! Your Job: #{@job_id} had finished. - Please check job result: http://#{@result_host}:#{@result_port}#{@result_root}\n\n#{signature}" - { 'to' => @submitter_email, 'body' => body, 'subject' => subject } + Bellow are comparsion result of the base_commit: + #{context.to_s} + \n\n#{signature}" + BODY + + data end def set_submitter_info - job = query_job - exit unless job && job['email'] + sleep 10 + @job = query_job + exit unless @job && @job['author_email'] - @submitter_email = job['email'] - @result_root = job['result_root'] + @email_to = @job['author_email'] + @email_cc = @job['committer_email'] + @result_root = @job['result_root'] end def query_job @@ -50,3 +68,18 @@ class MailJobResult query_result['hits']['hits'][0]['_source'] end end + +def get_compare_result(job) + min_samples = job['nr_num'].to_i + base_commit = job['base_commit'] + commit_id = job['commit_id'] + return nil unless base_commit && commit_id + + condition_list = [{'base_commit' => base_commit}, {'commit_id' => commit_id}] + options = { :min_samples => min_samples, :no_print => true} + + matrices_list, suite_list = create_matrices_list(condition_list, options[:min_samples]) + return nil if matrices_list.size < 2 + + compare_matrixes(matrices_list, suite_list, options: options) +end -- 2.23.0

1 0

[PATCH compass-ci 1/3] sbin/compare: support min_samples mode
by Lu Weitao 24 Apr '21

24 Apr '21

[Example] sbin/compare id=crystal.1686878,crystal.1686879 id=crystal.1686880,crystal.1686881 --min_samples 3 Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/compare.rb | 22 +++++++++++++++++++--- lib/matrix2.rb | 4 +++- sbin/compare | 5 +++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/compare.rb b/lib/compare.rb index 7386caea..a6fd9f98 100644 --- a/lib/compare.rb +++ b/lib/compare.rb @@ -20,7 +20,13 @@ require 'yaml' def compare_matrices_list(argv, common_conditions, options) condition_list = parse_argv(argv, common_conditions) - matrices_list, suite_list = create_matrices_list(condition_list) + matrices_list, suite_list = create_matrices_list(condition_list, options[:min_samples]) + if matrices_list.size < 2 + return nil if options[:no_print] + + warn "matrix less than min_samples" + end + compare_matrixes(matrices_list, suite_list, options: options) end @@ -35,13 +41,15 @@ def parse_argv(argv, common_conditions) conditions end -def create_matrices_list(conditions) +def create_matrices_list(conditions, min_samples) matrices_list = [] suite_list = [] es = ESQuery.new conditions.each do |condition| query_results = es.multi_field_query(condition, desc_keyword: 'start_time') - matrix, suites = combine_query_data(query_results) + matrix, suites = combine_query_data(query_results, min_samples) + next unless matrix + matrices_list << matrix suite_list.concat(suites) end @@ -49,6 +57,14 @@ def create_matrices_list(conditions) return matrices_list, suite_list end +def matrices_verification(matrices, options) + if matrices.size < 2 + return nil if options[:no_print] + + warn "matrix less than min_samples" + end +end + # ------------------------------------------------------------------------------------------- # compare_group # - one condition only diff --git a/lib/matrix2.rb b/lib/matrix2.rb index 12245a80..2fd63243 100644 --- a/lib/matrix2.rb +++ b/lib/matrix2.rb @@ -101,8 +101,10 @@ end # input: query results from es_query # return: matrix -def combine_query_data(query_data) +def combine_query_data(query_data, min_sample) job_list = extract_jobs_list(query_data['hits']['hits']) + return nil if job_list.size < min_sample + create_matrix(job_list) end diff --git a/sbin/compare b/sbin/compare index 2ee32688..bcb66ccf 100755 --- a/sbin/compare +++ b/sbin/compare @@ -22,6 +22,7 @@ is_group = false dimensions = nil colorful = nil options = {} +options[:min_samples] = 1 template = nil opt_parser = OptionParser.new do |opts| @@ -48,6 +49,10 @@ opt_parser = OptionParser.new do |opts| colorful = theme end + opts.on('--min_samples min_samples', 'give a number to litmit the min_samples of matrix which used to compare') do |min_samples| + options[:min_samples] = min_samples.to_i + end + opts.on('-t', '--template template', 'compare with user-defined template') do |t| template = t end -- 2.23.0

1 0

[PATCH lkp-tests] test: optimize mysql start command
by Luan Shengde 23 Apr '21

23 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/mysql-8-0-20 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/mysql-8-0-20 b/tests/mysql-8-0-20 index 0c60ed9dd..990a053d7 100755 --- a/tests/mysql-8-0-20 +++ b/tests/mysql-8-0-20 @@ -54,8 +54,8 @@ create_database() start_mysql() { - "$mysqld" --defaults-file=/etc/my.cnf --port="$mysql_port" - sleep 20 + "$mysql_server" start & + wait } main() -- 2.23.0

1 0

[PATCH v3 compass-ci] sbin/download-rootfs: download osimage
by Liu Yinsi 23 Apr '21

23 Apr '21

the default os_mount=initramfs, so download osimage to run qemu kvm. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/download-rootfs | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sbin/download-rootfs b/sbin/download-rootfs index 68a68039..cea416c0 100755 --- a/sbin/download-rootfs +++ b/sbin/download-rootfs @@ -19,22 +19,35 @@ os_version=${3:-20.03} load_cci_defaults rootfs_dir=/srv/os/${os}/${os_arch}/${os_version} +osimage_dir=/srv/initrd/osimage/${os}/${os_arch}/${os_version} -download_os_rootfs() -{ - mkdir -p $rootfs_dir - cd $rootfs_dir +mkdir -p $rootfs_dir $osimage_dir - download_url="http://api.compass-ci.openeuler.org:${SRV_HTTP_OS_PORT}/os/${os}/${os_arch}…" - wget $download_url +wget_download() +{ + local download_url=$1 + wget $download_url + + [ "$?" -ne 0 ] && { + log_error "failed to download os rootfs: $download_url" + exit 1 + } +} - [ "$?" -ne 0 ] && { - log_error "failed to download os rootfs: $download_url" - exit 1 - } +download_os_rootfs() +{ + cd $rootfs_dir + wget_download "http://api.compass-ci.openeuler.org:${SRV_HTTP_OS_PORT}/os/${os}/${os_arch}…" + + gzip -dc ${os_version}.cgz | cpio -id + rm -rf ${os_version}.cgz +} - gzip -dc ${os_version}.cgz | cpio -id - rm -rf ${os_version}.cgz +download_osimage() +{ + cd $osimage_dir + wget_download "http://api.compass-ci.openeuler.org:${SRV_HTTP_INITRD_PORT}/initrd/osimage/…" + wget_download "http://api.compass-ci.openeuler.org:${SRV_HTTP_INITRD_PORT}/initrd/deps/nfs…" } is_virtual() @@ -42,4 +55,4 @@ is_virtual() dmidecode -s system-product-name | grep -iq "virtual" } -is_virtual || download_os_rootfs +is_virtual || ( download_os_rootfs && download_osimage ) -- 2.23.0

1 0

[PATCH v3 compass-ci] container/scheduler-http: fix unfriendly error
by Liu Yinsi 23 Apr '21

23 Apr '21

before: /c/compass-ci/container/scheduler-https# ./start Traceback (most recent call last): ./start:14:in `<main>': CA certificate is missing. Ignore if the HTTPS scheduler is not required (RuntimeError) after: /c/compass-ci/container/scheduler-https# ./start CA certificate is missing. Ignore if the HTTPS scheduler is not required Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/scheduler-https/start | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/container/scheduler-https/start b/container/scheduler-https/start index 4ec84a28..5e79d2be 100755 --- a/container/scheduler-https/start +++ b/container/scheduler-https/start @@ -10,8 +10,10 @@ ca_path = '/etc/compass-ci/ca' crt_path = "#{ca_path}/server.crt" key_path = "#{ca_path}/server.key" -warn_msg = 'CA certificate is missing. Ignore if the HTTPS scheduler is not required' -raise warn_msg unless File.exist?(crt_path) && File.exist?(key_path) +unless File.exist?(crt_path) && File.exist?(key_path) + puts 'CA certificate is missing. Ignore if the HTTPS scheduler is not required' + exit +end names = Set.new %w[ SCHED_HOST -- 2.23.0

1 0

[PATCH v5 lkp-tests] tests/qcow2rootfs-x86_64: fix failed to build container using absolute path
by Wang Chenglong 23 Apr '21

23 Apr '21

[Error] root@2288hv5-2s44p-384g--b6 /c/lkp-tests/tests# /c/compass-ci/container/qcow2rootfs/build /c/compass-ci/container/qcow2rootfs/build: line 5: ../defconfig.sh: No such file or directory /c/compass-ci/container/qcow2rootfs/build: line 7: docker_skip_rebuild: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 index f698fb7ec..a783dc1a6 100755 --- a/tests/qcow2rootfs-x86_64 +++ b/tests/qcow2rootfs-x86_64 @@ -9,12 +9,17 @@ set_qcow2rootfs_tools() { export QCOW2_PATH="/c/compass-ci/container/qcow2rootfs" - git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci || return 1 + export CCI_SRC="/c/compass-ci" + git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci rm ${QCOW2_PATH}/root/etc/yum.repos.d/* wget -O ${QCOW2_PATH}/root/etc/yum.repos.d/CentOS-Base.repo https://repo.huaweicloud.com/repository/conf/CentOS-7-reg.repo - ${QCOW2_PATH}/build + cd ${QCOW2_PATH} + ./build || { + echo "build container failed~" + exit 1 + } sed -i 's#$EXTRACT_ROOT/bin/extract $QCOW2_FILE $tar_out_file#$EXTRACT_ROOT/bin/extract $EXTRACT_ROOT/qcow2-dir/$QCOW2_NAME $tar_out_file#' \ - ${QCOW2_PATH}/bin/mail + ${QCOW2_PATH}/bin/main } @@ -52,7 +57,13 @@ extract_rootfs() export ROOTFS_DIR="${qcow2_version}-$(date +%Y-%m-%d-%H-%M-%S)" export ROOTFS_PATH="${MOUNT_POINT}/openeuler/${qcow2_arch}/automatic-build/${ROOTFS_DIR}" mkdir -p $ROOTFS_PATH - ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} + cd $CCI_SRC/container/dracut-initrd + ./build || { + echo "build container failed~" + exit 1 + } + cd ${QCOW2_PATH} + ./run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} } set_resolv_config() -- 2.23.0

1 0

[PATCH v4 lkp-tests] tests/qcow2rootfs-x86_64: fix failed to build container using absolute path
by Wang Chenglong 23 Apr '21

23 Apr '21

[Error] root@2288hv5-2s44p-384g--b6 /c/lkp-tests/tests# /c/compass-ci/container/qcow2rootfs/build /c/compass-ci/container/qcow2rootfs/build: line 5: ../defconfig.sh: No such file or directory /c/compass-ci/container/qcow2rootfs/build: line 7: docker_skip_rebuild: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 index f698fb7ec..792a80fb9 100755 --- a/tests/qcow2rootfs-x86_64 +++ b/tests/qcow2rootfs-x86_64 @@ -9,12 +9,17 @@ set_qcow2rootfs_tools() { export QCOW2_PATH="/c/compass-ci/container/qcow2rootfs" - git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci || return 1 + export CCI_SRC="/c/compass-ci" + git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci rm ${QCOW2_PATH}/root/etc/yum.repos.d/* wget -O ${QCOW2_PATH}/root/etc/yum.repos.d/CentOS-Base.repo https://repo.huaweicloud.com/repository/conf/CentOS-7-reg.repo - ${QCOW2_PATH}/build + cd ${QCOW2_PATH} + ./build || { + echo "build container failed~" + exit 1 + } sed -i 's#$EXTRACT_ROOT/bin/extract $QCOW2_FILE $tar_out_file#$EXTRACT_ROOT/bin/extract $EXTRACT_ROOT/qcow2-dir/$QCOW2_NAME $tar_out_file#' \ - ${QCOW2_PATH}/bin/mail + ${QCOW2_PATH}/bin/main } @@ -51,15 +56,20 @@ extract_rootfs() { export ROOTFS_DIR="${qcow2_version}-$(date +%Y-%m-%d-%H-%M-%S)" export ROOTFS_PATH="${MOUNT_POINT}/openeuler/${qcow2_arch}/automatic-build/${ROOTFS_DIR}" + cd $CCI_SRC/container/dracut-initrd + ./build || { + echo "build container failed~" + exit 1 + } mkdir -p $ROOTFS_PATH - ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} + ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} } set_resolv_config() { - cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF - nameserver 114.114.114.114 - EOF + cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF + nameserver 114.114.114.114 + EOF } set_link() @@ -71,6 +81,7 @@ set_link() echo $ROOTFS_PATH } + set_qcow2rootfs_tools check_url download_qcow2_img -- 2.23.0

1 1

[PATCH compass-ci] sbin: configuring ES authentication information
by Wu Zhende 23 Apr '21

23 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- sbin/es-accounts-mapping.sh | 8 ++++++-- sbin/es-jobs-mapping.sh | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sbin/es-accounts-mapping.sh b/sbin/es-accounts-mapping.sh index c4ac2fc..580b459 100755 --- a/sbin/es-accounts-mapping.sh +++ b/sbin/es-accounts-mapping.sh @@ -2,15 +2,19 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +. $CCI_SRC/container/defconfig.sh + +load_service_authentication + # check whether accounts index has created -status_code=$(curl -sSIL -w "%{http_code}\\n" -o /dev/null http://localhost:9200/accounts) +status_code=$(curl -sSIL -u "${ES_USER}:${ES_PASSWORD}" -w "%{http_code}\\n" -o /dev/null http://localhost:9200/accounts) if [ "$status_code" -eq 200 ] then echo "accounts index has been created, exit." else echo "begin create index." - curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/accounts' -d '{ + curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/accounts' -u "${ES_USER}:${ES_PASSWORD}" -d '{ "mappings": { "dynamic": false, "properties": { diff --git a/sbin/es-jobs-mapping.sh b/sbin/es-jobs-mapping.sh index 67b1ed1..15000d9 100755 --- a/sbin/es-jobs-mapping.sh +++ b/sbin/es-jobs-mapping.sh @@ -2,6 +2,10 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +. $CCI_SRC/container/defconfig.sh + +load_service_authentication + # Determine whether curl is installed. If not, install curl. if ! [ -x "$(command -v curl)" ] then @@ -28,14 +32,14 @@ then fi # Determine whether jobs index has created -status_code=$(curl -sSIL -w "%{http_code}\n" -o /dev/null http://localhost:9200/jobs) +status_code=$(curl -sSIL -u "${ES_USER}:${ES_PASSWORD}" -w "%{http_code}\n" -o /dev/null http://localhost:9200/jobs) if [ $status_code -eq 200 ] then echo "jobs index has create, exit." else echo "jobs index not exists, begin create index." - curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/jobs' -d '{ + curl -sSH 'Content-Type: Application/json' -XPUT 'http://localhost:9200/jobs' -u "${ES_USER}:${ES_PASSWORD}" -d '{ "mappings": { "dynamic": false, "dynamic_templates": [ @@ -185,7 +189,7 @@ else echo "create jobs index failed." else echo "set index.mapping.total_fields.limit: 10000" - curl -sS -XPUT 127.0.0.1:9200/jobs/_settings -H 'Content-Type: application/json' \ + curl -sS -XPUT 127.0.0.1:9200/jobs/_settings -u "${ES_USER}:${ES_PASSWORD}" -H 'Content-Type: application/json' \ -d '{"index.mapping.total_fields.limit": 10000}' fi fi -- 2.23.0

1 0

[PATCH lkp-tests 3/3] tests/qcow2rootfs-x86_64: fix failed to build container using absolute path
by Wang Chenglong 23 Apr '21

23 Apr '21

[Error] root@2288hv5-2s44p-384g--b6 /c/lkp-tests/tests# /c/compass-ci/container/qcow2rootfs/build /c/compass-ci/container/qcow2rootfs/build: line 5: ../defconfig.sh: No such file or directory /c/compass-ci/container/qcow2rootfs/build: line 7: docker_skip_rebuild: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 index f698fb7ec..6826e39ef 100755 --- a/tests/qcow2rootfs-x86_64 +++ b/tests/qcow2rootfs-x86_64 @@ -9,12 +9,17 @@ set_qcow2rootfs_tools() { export QCOW2_PATH="/c/compass-ci/container/qcow2rootfs" + export CCI_SRC="/c/compass-ci" git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci || return 1 rm ${QCOW2_PATH}/root/etc/yum.repos.d/* wget -O ${QCOW2_PATH}/root/etc/yum.repos.d/CentOS-Base.repo https://repo.huaweicloud.com/repository/conf/CentOS-7-reg.repo - ${QCOW2_PATH}/build + cd ${QCOW2_PATH} + ./build || { + echo "build container failed~" + exit 1 + } sed -i 's#$EXTRACT_ROOT/bin/extract $QCOW2_FILE $tar_out_file#$EXTRACT_ROOT/bin/extract $EXTRACT_ROOT/qcow2-dir/$QCOW2_NAME $tar_out_file#' \ - ${QCOW2_PATH}/bin/mail + ${QCOW2_PATH}/bin/main } @@ -51,15 +56,20 @@ extract_rootfs() { export ROOTFS_DIR="${qcow2_version}-$(date +%Y-%m-%d-%H-%M-%S)" export ROOTFS_PATH="${MOUNT_POINT}/openeuler/${qcow2_arch}/automatic-build/${ROOTFS_DIR}" + cd $CCI_SRC/container/dracut-initrd + ./build || { + echo "build container failed~" + exit 1 + } mkdir -p $ROOTFS_PATH - ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} + ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} || exit 1 } set_resolv_config() { - cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF - nameserver 114.114.114.114 - EOF + cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF + nameserver 114.114.114.114 + EOF } set_link() @@ -71,6 +81,7 @@ set_link() echo $ROOTFS_PATH } + set_qcow2rootfs_tools check_url download_qcow2_img -- 2.23.0

2 2

[PATCH lkp-tests 1/3] install-iso-pre: add depend pkg: wget
by Yu Chuan 23 Apr '21

23 Apr '21

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- distro/depends/install-iso-pre | 1 + 1 file changed, 1 insertion(+) diff --git a/distro/depends/install-iso-pre b/distro/depends/install-iso-pre index 4569e1e3cdc0..7a66195e44fd 100644 --- a/distro/depends/install-iso-pre +++ b/distro/depends/install-iso-pre @@ -1,3 +1,4 @@ lvm2 ruby git +wget -- 2.23.0

1 0

[PATCH v2 compass-ci] sbin/download-rootfs: download osimage
by Liu Yinsi 23 Apr '21

23 Apr '21

the default os_mount=initramfs, so download osimage to run qemu kvm. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/download-rootfs | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/sbin/download-rootfs b/sbin/download-rootfs index 68a68039..d936dbe6 100755 --- a/sbin/download-rootfs +++ b/sbin/download-rootfs @@ -19,22 +19,35 @@ os_version=${3:-20.03} load_cci_defaults rootfs_dir=/srv/os/${os}/${os_arch}/${os_version} +osimage_dir=/srv/initrd/osimage/${os}/${os_arch}/${os_version} -download_os_rootfs() -{ - mkdir -p $rootfs_dir - cd $rootfs_dir +mkdir -p $rootfs_dir $osimage_dir - download_url="http://api.compass-ci.openeuler.org:${SRV_HTTP_OS_PORT}/os/${os}/${os_arch}…" - wget $download_url +download_one() +{ + local download_url=$1 + wget $download_url + + [ "$?" -ne 0 ] && { + log_error "failed to download os rootfs: $download_url" + exit 1 + } +} - [ "$?" -ne 0 ] && { - log_error "failed to download os rootfs: $download_url" - exit 1 - } +download_os_rootfs() +{ + cd $rootfs_dir + download_one "http://api.compass-ci.openeuler.org:${SRV_HTTP_OS_PORT}/os/${os}/${os_arch}…" + + gzip -dc ${os_version}.cgz | cpio -id + rm -rf ${os_version}.cgz +} - gzip -dc ${os_version}.cgz | cpio -id - rm -rf ${os_version}.cgz +download_osimage() +{ + cd $osimage_dir + download_one "http://api.compass-ci.openeuler.org:${SRV_HTTP_INITRD_PORT}/initrd/osimage/…" + download_one "http://api.compass-ci.openeuler.org:${SRV_HTTP_INITRD_PORT}/initrd/deps/nfs…" } is_virtual() @@ -43,3 +56,4 @@ is_virtual() } is_virtual || download_os_rootfs +is_virtual || download_osimage -- 2.23.0

1 0

[PATCH v2 compass-ci] container/scheduler-http: fix unfriendly error
by Liu Yinsi 23 Apr '21

23 Apr '21

before: /c/compass-ci/container/scheduler-https# ./start Traceback (most recent call last): ./start:14:in `<main>': CA certificate is missing. Ignore if the HTTPS scheduler is not required (RuntimeError) after: /c/compass-ci/container/scheduler-https# ./start CA certificate is missing. Ignore if the HTTPS scheduler is not required Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/scheduler-https/start | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/container/scheduler-https/start b/container/scheduler-https/start index 4ec84a28..374300c0 100755 --- a/container/scheduler-https/start +++ b/container/scheduler-https/start @@ -11,7 +11,10 @@ crt_path = "#{ca_path}/server.crt" key_path = "#{ca_path}/server.key" warn_msg = 'CA certificate is missing. Ignore if the HTTPS scheduler is not required' -raise warn_msg unless File.exist?(crt_path) && File.exist?(key_path) +unless File.exist?(crt_path) && File.exist?(key_path) + puts warn_msg + exit +end names = Set.new %w[ SCHED_HOST -- 2.23.0

1 0

[PATCH compass-ci] container/es: support to build es images in x86_64 machine
by Liu Yinsi 23 Apr '21

23 Apr '21

choose base image according to different arch. arch: aarch64 => base image: elasticsearch:7.11.1@sha256:d52cda1e73d1b1915ba2d76ca1e426620c7b5d6942d9d2f432259503974ba786 arch: x86_64 => base image: elasticsearch:7.11.1 Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/es/Dockerfile | 3 ++- container/es/build | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/container/es/Dockerfile b/container/es/Dockerfile index f29e677e..bc320076 100644 --- a/container/es/Dockerfile +++ b/container/es/Dockerfile @@ -1,7 +1,8 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -FROM elasticsearch:7.11.1@sha256:d52cda1e73d1b1915ba2d76ca1e426620c7b5d6942d9d2f432259503974ba786 +ARG BASE_IMAGE +FROM ${BASE_IMAGE} ARG MEMORY ARG USER diff --git a/container/es/build b/container/es/build index e0232270..73593f4b 100755 --- a/container/es/build +++ b/container/es/build @@ -14,6 +14,12 @@ names = Set.new %w[ defaults = relevant_service_authentication(names) docker_skip_rebuild "es:7.11.1" +BASE_IMAGE_DICT = { + 'aarch64' => 'elasticsearch:7.11.1@sha256:d52cda1e73d1b1915ba2d76ca1e426620c7b5d6942d9d2f432259503974ba786', + 'x86_64' => 'elasticsearch:7.11.1' }.freeze + +BASE_IMAGE = BASE_IMAGE_DICT[%x(arch).chomp] + available_memory = get_available_memory -system "docker build -t es:7.11.1 --build-arg MEMORY=#{available_memory} --build-arg USER=#{defaults['ES_USER']} --build-arg PASSWORD=#{defaults['ES_PASSWORD']} --network=host ." +system "docker build -t es:7.11.1 --build-arg MEMORY=#{available_memory} --build-arg USER=#{defaults['ES_USER']} --build-arg PASSWORD=#{defaults['ES_PASSWORD']} --build-arg BASE_IMAGE=#{BASE_IMAGE} --network=host ." -- 2.23.0

1 0

[PATCH compass-ci] container/kibana: configuring ES authentication information
by Wu Zhende 23 Apr '21

23 Apr '21

Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- container/kibana/Dockerfile | 7 +++++-- container/kibana/build | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/container/kibana/Dockerfile b/container/kibana/Dockerfile index 970eb5a..7085618 100644 --- a/container/kibana/Dockerfile +++ b/container/kibana/Dockerfile @@ -5,8 +5,11 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} -# docker image borrowed from hub.docker.com/r/gagara/kibana-oss-arm64 +ARG USER +ARG PASSWORD MAINTAINER Wu Zhende <wuzhende666(a)163.com> -RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml +RUN sed -i 's/server.host: "0"/server.host: "0.0.0.0"/' config/kibana.yml && \ + sed -i "6i\elasticsearch.username: ${USER}" config/kibana.yml && \ + sed -i "6i\elasticsearch.password: ${PASSWORD}" config/kibana.yml diff --git a/container/kibana/build b/container/kibana/build index 9c75aeb..c7bcd40 100755 --- a/container/kibana/build +++ b/container/kibana/build @@ -3,8 +3,16 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. # frozen_string_literal: true +require 'set' require_relative '../defconfig' +names = Set.new %w[ + ES_USER + ES_PASSWORD +] + +defaults = relevant_service_authentication(names) + docker_skip_rebuild "kibana:7.11.1" BASE_IMAGE_DICT = { @@ -13,4 +21,4 @@ BASE_IMAGE_DICT = { BASE_IMAGE = BASE_IMAGE_DICT[%x(arch).chomp] -system "docker build -t kibana:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} ." +system "docker build -t kibana:7.11.1 --build-arg BASE_IMAGE=#{BASE_IMAGE} --build-arg USER=#{defaults['ES_USER']} --build-arg PASSWORD=#{defaults['ES_PASSWORD']} ." -- 2.23.0

1 0

[PATCH v2 compass-ci] container/etcd: adapt to the x86_64
by Cao Xueliang 23 Apr '21

23 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/etcd/Dockerfile | 9 +++++---- container/etcd/build | 11 ++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/container/etcd/Dockerfile b/container/etcd/Dockerfile index f4746ab..1612dbd 100644 --- a/container/etcd/Dockerfile +++ b/container/etcd/Dockerfile @@ -6,12 +6,13 @@ FROM alpine:3.13 MAINTAINER Cao Xueliang <caoxl78320(a)163.com> ARG VERSION +ARG ARCH RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories && \ apk update && apk add ca-certificates && \ - wget https://repo.huaweicloud.com/etcd/${VERSION}/etcd-${VERSION}-linux-arm64.ta… && \ - tar zxvf etcd-${VERSION}-linux-arm64.tar.gz && \ - mv etcd-${VERSION}-linux-arm64/etcd* /bin/ && \ - rm -Rf etcd-${VERSION}-linux-arm64* /var/cache/apk/* + wget https://repo.huaweicloud.com/etcd/${VERSION}/etcd-${VERSION}-linux-${ARCH}.… && \ + tar zxvf etcd-${VERSION}-linux-${ARCH}.tar.gz && \ + mv etcd-${VERSION}-linux-${ARCH}/etcd* /bin/ && \ + rm -Rf etcd-${VERSION}-linux-${ARCH}* /var/cache/apk/* VOLUME /data diff --git a/container/etcd/build b/container/etcd/build index 37c2326..58def3d 100755 --- a/container/etcd/build +++ b/container/etcd/build @@ -4,7 +4,12 @@ . ../defconfig.sh -version=v3.4.15 -docker_skip_rebuild "etcd-${version}:alpine" +VERSION=v3.4.15 +docker_skip_rebuild "etcd-${VERSION}:alpine" -docker build -t etcd-${version}:alpine --build-arg VERSION=${version} . +[ "$(arch)" == "aarch64" ] && ARCH=arm64 +[ "$(arch)" == "x86_64" ] && ARCH=amd64 + +docker_skip_rebuild "etcd-${VERSION}:alpine" + +docker build -t etcd-${VERSION}:alpine --build-arg VERSION=${VERSION} --build-arg ARCH=${ARCH} . -- 2.23.0

1 0

[PATCH v2 lkp-tests] jobs: add keys for jobs
by Luan Shengde 23 Apr '21

23 Apr '21

add key for specify mysql socket Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/mysql-8-0-20.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/mysql-8-0-20.yaml b/jobs/mysql-8-0-20.yaml index 1926c5547..8c30f963e 100644 --- a/jobs/mysql-8-0-20.yaml +++ b/jobs/mysql-8-0-20.yaml @@ -32,3 +32,4 @@ sysbench-mysql: oltp_read_only: false report_interval: 1 events: 20000 + mysql_socket: /data/mysql/run/mysql.sock -- 2.23.0

1 0

[PATCH lkp-tests 5/6] tests: fix bugs
by Luan Shengde 23 Apr '21

23 Apr '21

del delete line: skip-grant-tables it will lead to access denied error. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/mysql-8-0-20 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/mysql-8-0-20 b/tests/mysql-8-0-20 index ebc7c0e90..0c60ed9dd 100755 --- a/tests/mysql-8-0-20 +++ b/tests/mysql-8-0-20 @@ -40,7 +40,6 @@ configure_mysql() sleep 10 "$mysql" -u "$mysql_user" -e "flush privileges; use mysql; alter user 'root'@'localhost' identified by '$mysql_password'; flush privileges;" - sed -i '/^skip-grant-tables/d' /etc/my.cnf "$mysql_server" restart sleep 10 } -- 2.23.0

2 2

[PATCH lkp-tests 4/6] depends: add depends list file for installing mysql
by Luan Shengde 23 Apr '21

23 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- distro/depends/mysql-8-0-20-dev | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 distro/depends/mysql-8-0-20-dev diff --git a/distro/depends/mysql-8-0-20-dev b/distro/depends/mysql-8-0-20-dev new file mode 100644 index 000000000..23c6ff661 --- /dev/null +++ b/distro/depends/mysql-8-0-20-dev @@ -0,0 +1,16 @@ +libnuma1 +xfsprogs +ethtool +gcc +cmake +libssl-dev +libncurses5-dev +libtirpc-dev +rpcsvc-proto-devel +rpcgen +gmp +gmp-devel +libmpc +libmpc-devel +mpfr +mpfr-devel -- 2.23.0

1 1

[PATCH lkp-tests 3/6] tests: add initialize file for mysql
by Luan Shengde 23 Apr '21

23 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/mysql-8-0-20 | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100755 tests/mysql-8-0-20 diff --git a/tests/mysql-8-0-20 b/tests/mysql-8-0-20 new file mode 100755 index 000000000..ebc7c0e90 --- /dev/null +++ b/tests/mysql-8-0-20 @@ -0,0 +1,73 @@ +#!/bin/sh +# - data_dev +# mysql_user +# mysql_host +# mysql_port +# mysql_db +# mysql_password +. $LKP_SRC/lib/common.sh + +: "${mysql_user:=root}" +: "${mysql_host:=127.0.0.1}" +: "${mysql_port:=3306}" +: "${mysql_db:=sysbench_test}" +: "${mysql_password:=mysql_password}" + +create_basedir() +{ + mkdir -p /data + mkfs.xfs -f /dev/"$data_dev" + mount /dev/"$data_dev" /data + + mkdir -p /data/mysql/{data,share,tmp,run,log} + + useradd mysql + touch /data/mysql/log/mysql.log + chown -R mysql:mysql /data + chown -R mysql:mysql /data/mysql/log/mysql.log +} + +configure_mysql() +{ + if [ ! -f $mysqld ] || [ ! -f $mysql ] || [ ! -f $mysql_server ]; then + echo "mysql is not installed!" && exit 1 + fi + + "$mysqld" --user=mysql --datadir=/data/mysql/data --basedir=/data/mysql --initialize --port="$mysql_port" + sleep 10 + + "$mysql_server" start + sleep 10 + + "$mysql" -u "$mysql_user" -e "flush privileges; use mysql; alter user 'root'@'localhost' identified by '$mysql_password'; flush privileges;" + sed -i '/^skip-grant-tables/d' /etc/my.cnf + "$mysql_server" restart + sleep 10 +} + +create_database() +{ + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "use mysql; update user set host ='%' where user='root'; flush privileges;" + "$mysql" -u "$mysql_user" -p"$mysql_password" -e "create database $mysql_db;" + "$mysql_server" stop + sleep 10 +} + +start_mysql() +{ + "$mysqld" --defaults-file=/etc/my.cnf --port="$mysql_port" + sleep 20 +} + +main() +{ + local mysql="/usr/local/mysql/bin/mysql" + local mysqld="/usr/local/mysql/bin/mysqld" + local mysql_server="/usr/local/mysql/support-files/mysql.server" + + create_basedir + configure_mysql + create_database + start_mysql +} +main -- 2.23.0

1 1

[PATCH lkp-tests 2/6] add pkgbuild file
by Luan Shengde 23 Apr '21

23 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- pkg/mysql-8-0-20/PKGBUILD | 79 +++++++++++++++++++++++++++++++++++++++ pkg/mysql-8-0-20/my.cnf | 69 ++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 pkg/mysql-8-0-20/PKGBUILD create mode 100644 pkg/mysql-8-0-20/my.cnf diff --git a/pkg/mysql-8-0-20/PKGBUILD b/pkg/mysql-8-0-20/PKGBUILD new file mode 100644 index 000000000..154f936cf --- /dev/null +++ b/pkg/mysql-8-0-20/PKGBUILD @@ -0,0 +1,79 @@ +pkgname=mysql-server-mysql +pkgver=8.0.20 +gccdir=gcc +pkgrel=1 +arch=('aarch64' 'x86_64') +url="http://www.mysql.com" +license=('GPLv2') +source=("https://gitee.com/li-yancheng/my-sql_with_boostkit_patch.git" + "https://gitee.com/li-yancheng/gcc.git" + "my.cnf") +md5sums=('SKIP' 'SKIP' '99c4965aa870c475000993f52a0dee66') + +build() +{ + # build_gcc + build_mysql +} + +build_gcc() +{ + mkdir -p $HOME/rpmbuild/SOURCES/ && { + cd $srcdir/gcc && cp -r * $HOME/rpmbuild/SOURCES/ + } + + cd $HOME/rpmbuild/SOURCES/ && { + rpmbuild -bp gcc.spec + } + + cd $HOME/rpmbuild/BUILD/gcc-9.3.0 && { + ./configure --prefix=/usr/ \ + --enable-shared \ + --enable-threads=posix \ + --enable-checking=release \ + --with-system-zlib \ + --enable-__cxa_atexit \ + --disable-libunwind-exceptions \ + --enable-gnu-unique-object \ + --enable-linker-build-id \ + --with-linker-hash-style=gnu \ + --enable-languages=c,c++,objc,obj-c++,fortran,lto \ + --enable-plugin \ + --enable-initfini-array \ + --disable-libgcj \ + --without-isl \ + --without-cloog \ + --enable-gnu-indirect-function \ + --with-stage1-ldflags='-Wl,-z,relro,-z,now' \ + --with-boot-ldflags='-Wl,-z,relro,-z,now' \ + --with-multilib-list=lp64 + make -j96 + make install + } +} + +build_mysql() +{ + unset CPPFLAGS + unset CFLAGS + unset CXXFLAGS + cd $srcdir/my-sql_with_boostkit_patch/$pkgname-$pkgver + + CMAKE=cmake + grep -sqF "CentOS Linux release 7" /etc/centos-release && CMAKE=cmake3 + + mkdir -p build + cd build && { + $CMAKE .. -DBUILD_CONFIG=mysql_release -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DMYSQL_DATADIR=/data/mysql/data -DSYSCONFDIR=/etc -DWITH_BOOST=../boost/boost_1_70_0/ + make -j96 + } +} + +package() +{ + cp my.cnf /etc/ + + cd $srcdir/my-sql_with_boostkit_patch/$pkgname-$pkgver/build && { + make install + } +} diff --git a/pkg/mysql-8-0-20/my.cnf b/pkg/mysql-8-0-20/my.cnf new file mode 100644 index 000000000..49e5bc3df --- /dev/null +++ b/pkg/mysql-8-0-20/my.cnf @@ -0,0 +1,69 @@ +[mysqld_safe] +log-error=/data/mysql/log/mysql.log +pid-file=/data/mysql/run/mysqld.pid +[mysqldump] +quick +[mysql] +[client] +# default-character-set=utf8mb4 +default-character-set=utf8 +socket=/data/mysql/run/mysql.sock + +[mysqld] +socket=/data/mysql/run/mysql.sock +tmpdir=/data/mysql/tmp +datadir=/data/mysql/data +basedir=/usr/local/mysql +default_authentication_plugin=mysql_native_password +user=mysql +memlock=on +bind-address=0.0.0.0 +skip-name-resolve +skip-grant-tables + +lc-messages=en_US +lc-messages-dir=/usr/local/mysql/share + +innodb_page_size=64k +max_connections=4000 +back_log=2048 +performance_schema=OFF +max_prepared_stmt_count=128000 + +#file +innodb_file_per_table +innodb_log_file_size=2048M +innodb_log_files_in_group=32 +innodb_open_files=10000 +table_open_cache_instances=64 + +#buffers +innodb_buffer_pool_size=128G +innodb_buffer_pool_instances=64 +innodb_log_buffer_size=2048M + +#tune +sync_binlog=0 +innodb_flush_log_at_trx_commit=0 +innodb_use_native_aio=1 +innodb_spin_wait_delay=160 +innodb_sync_spin_loops=20 +innodb_flush_method=O_DIRECT +innodb_io_capacity=30000 +innodb_io_capacity_max=40000 +innodb_lru_scan_depth=9000 +innodb_page_cleaners=1 +innodb_spin_wait_pause_multiplier=25 + +#perf special +innodb_flush_neighbors=0 +innodb_write_io_threads=1 +innodb_read_io_threads=1 +innodb_purge_threads=1 + +sql_mode=STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION,NO_AUTO_VALUE_ON_ZERO,STRICT_ALL_TABLES + +#skop_log_bin +ssl=0 + +table_open_cache=15000 -- 2.23.0

1 1

[PATCH lkp-tests 1/6] jobs: add job file for installing/testing mysql
by Luan Shengde 23 Apr '21

23 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- jobs/mysql-8-0-20.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 jobs/mysql-8-0-20.yaml diff --git a/jobs/mysql-8-0-20.yaml b/jobs/mysql-8-0-20.yaml new file mode 100644 index 000000000..1926c5547 --- /dev/null +++ b/jobs/mysql-8-0-20.yaml @@ -0,0 +1,34 @@ +suite: cci-makepkg +category: functional + +testbox: taishan200-2280-2s48p-256g--a18 + +os: openeuler +os_version: 20.03 +os_mount: initramfs + +mysql_user: +mysql_host: +mysql_port: +mysql_db: +mysql_password: +data_dev: sdb + +cci-makepkg: + benchmark: mysql-8-0-20 + +mysql-8-0-20: + +sysbench-mysql: + oltp_test_mode: complex + max_requests: 0 + mysql_table_engine: innodb + oltp_tables_count: 1000 + oltp_table_size: 100000 + nr_threads: 256 + runtime: 60 + rand_type: special + rand_spec_pct: 100 + oltp_read_only: false + report_interval: 1 + events: 20000 -- 2.23.0

1 1

[PATCH lkp-tests 6/6] tests: add specify mysql socket
by Luan Shengde 23 Apr '21

23 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- tests/sysbench-mysql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/sysbench-mysql b/tests/sysbench-mysql index 0ade2dab9..d7b7fc148 100755 --- a/tests/sysbench-mysql +++ b/tests/sysbench-mysql @@ -14,6 +14,7 @@ # mysql_db # mysql_password # db_driver +# mysql_socket : "${mysql_user:=root}" : "${mysql_host:=$server}" @@ -30,6 +31,7 @@ : "${report_interval:=1}" : "${oltp_read_only:=off}" : "${events:=2000000000}" +: "${mysql_socket:=/data/mysql/run/mysql.sock}" args1=( --mysql-user=$mysql_user @@ -44,10 +46,12 @@ args1=( --rand-spec-pct=$rand_spec_pct --threads=$nr_threads --time=$runtime + --mysql-socket=$mysql_socket ) args2=( --mysql-user=$mysql_user + --mysql-socket=$mysql_socket --mysql-password=$mysql_password --mysql-host=$mysql_host --mysql-port=$mysql_port -- 2.23.0

1 0

[PATCH v3 lkp-tests] jobs/rpmbuild-pkg.yaml: remove upstream_repo
by Lin Jiaxin 23 Apr '21

23 Apr '21

Assigning a null value to upstream_repo is meaningless. And when use "submit upstream_repo=xxx rpmbuild-pkg.yaml" will make upstream_repo be null. Unless we put "upstream_repo=xxx" behind. Or declare it in yaml. [example] linjiaxin@crystal ~%/home/linjiaxin/lkp-tests/sbin/submit upstream_repo="a/azk/azk" upstream_url=https://github.com/azukiapp/azk pkgbuild_repo=archlinux/aur-a/azk-git testbox=dc-16g os=openeuler os_version=20.03-LTS os_mount=container os_arch=aarch64 docker_image=openeuler:20.03-LTS repo_name=aur rpmbuild-pkg.yaml upstream_branch=master upstream_commit=e72adb039e4dd64fd6ed81d82fd597c1d4efdf14 upstream_dir=upstream submit_id=d18fabcd-6302-464c-aa99-3ed9e610704b submit /home/linjiaxin/lkp-tests/jobs/rpmbuild-pkg.yaml, got job id=crystal.1594407 linjiaxin@crystal ~% es-find id=crystal.1594407 | grep upstream_repo "upstream_repo": null, Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- jobs/rpmbuild-pkg.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/rpmbuild-pkg.yaml b/jobs/rpmbuild-pkg.yaml index a70590afe..5860ba029 100644 --- a/jobs/rpmbuild-pkg.yaml +++ b/jobs/rpmbuild-pkg.yaml @@ -1,5 +1,4 @@ suite: rpmbuild-pkg category: functional -upstream_repo: rpmbuild-pkg: -- 2.23.0

1 0

[PATCH v3 lkp-tests] tests/qcow2rootfs-x86_64: fix failed to build container using absolute path
by Wang Chenglong 23 Apr '21

23 Apr '21

[Error] root@2288hv5-2s44p-384g--b6 /c/lkp-tests/tests# /c/compass-ci/container/qcow2rootfs/build /c/compass-ci/container/qcow2rootfs/build: line 5: ../defconfig.sh: No such file or directory /c/compass-ci/container/qcow2rootfs/build: line 7: docker_skip_rebuild: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 index f698fb7ec..6826e39ef 100755 --- a/tests/qcow2rootfs-x86_64 +++ b/tests/qcow2rootfs-x86_64 @@ -9,12 +9,17 @@ set_qcow2rootfs_tools() { export QCOW2_PATH="/c/compass-ci/container/qcow2rootfs" + export CCI_SRC="/c/compass-ci" git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci || return 1 rm ${QCOW2_PATH}/root/etc/yum.repos.d/* wget -O ${QCOW2_PATH}/root/etc/yum.repos.d/CentOS-Base.repo https://repo.huaweicloud.com/repository/conf/CentOS-7-reg.repo - ${QCOW2_PATH}/build + cd ${QCOW2_PATH} + ./build || { + echo "build container failed~" + exit 1 + } sed -i 's#$EXTRACT_ROOT/bin/extract $QCOW2_FILE $tar_out_file#$EXTRACT_ROOT/bin/extract $EXTRACT_ROOT/qcow2-dir/$QCOW2_NAME $tar_out_file#' \ - ${QCOW2_PATH}/bin/mail + ${QCOW2_PATH}/bin/main } @@ -51,15 +56,20 @@ extract_rootfs() { export ROOTFS_DIR="${qcow2_version}-$(date +%Y-%m-%d-%H-%M-%S)" export ROOTFS_PATH="${MOUNT_POINT}/openeuler/${qcow2_arch}/automatic-build/${ROOTFS_DIR}" + cd $CCI_SRC/container/dracut-initrd + ./build || { + echo "build container failed~" + exit 1 + } mkdir -p $ROOTFS_PATH - ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} + ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} || exit 1 } set_resolv_config() { - cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF - nameserver 114.114.114.114 - EOF + cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF + nameserver 114.114.114.114 + EOF } set_link() @@ -71,6 +81,7 @@ set_link() echo $ROOTFS_PATH } + set_qcow2rootfs_tools check_url download_qcow2_img -- 2.23.0

1 1

[PATCH lkp-tests 1/3] status 04-8
by Wang Chenglong 22 Apr '21

22 Apr '21

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- stats/ansible_test | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/stats/ansible_test b/stats/ansible_test index 664fd53e0..0cbad6519 100755 --- a/stats/ansible_test +++ b/stats/ansible_test @@ -52,7 +52,7 @@ def parse_msg(ansible_failed_json) output_error $1 when /(Could not find .*):/ output_error $1 - when /(Unsupported parameters) for/ + when /(Unsupported parameters for.*module):/ output_error $1 when /aajdhch/ output_error $1 @@ -66,6 +66,14 @@ def parse_msg(ansible_failed_json) output_error $1 when /(Unable to stop.*):/ output_error $1 + when /AnsibleUndefinedVariable: (.*)/ + output_error $1 + when /(Failed to find handler .*)"\./ + output_error $1 + when /(Connection failure: .*)/ + output_error $1 + when /(Docker .*)\. / + output_error $1 when /non-zero return code|Failed to install some of the specified packages/ return else @@ -82,7 +90,8 @@ def parse_stderr(ansible_failed_json) output_error "gcc: Make error" else ansible_failed_json['stderr_lines'].each do |i| - next if i =~ /^ .*\~.*|^ .*\^$/ + next if i =~ /^ .*\~.*|^ .*\^$|\*.*/ + next if i =~ /Problems in request/ output_error i end @@ -109,21 +118,23 @@ def parse_failures(ansible_failed_json) end def parse_stdout(ansible_failed_json) - case ansible_failed_json['stdout'] - when ansible_failed_json.nil? - return - when ansible_failed_json['cmd'] =~ /make install/ - return - else - ansible_failed_json['stdout_lines'].each do |i| - next if i =~ /^$/ - next if ansible_failed_json['cmd'] =~ /make install/ - next if i =~ /Last metadata expiration/ - next if i =~ /^##.*/ - next if i =~ /^\+.*/ + if ansible_failed_json['stderr_lines'].nil? + case ansible_failed_json['stdout'] + when ansible_failed_json.nil? + return + when ansible_failed_json['cmd'] =~ /make install/ + return + else + ansible_failed_json['stdout_lines'].each do |i| + next if i =~ /^$/ + next if ansible_failed_json['cmd'] =~ /make install/ + next if i =~ /Last metadata expiration/ + next if i =~ /^##.*|^#.*/ + next if i =~ /^\+.*/ - output_error i - end + output_error i + end + end end end -- 2.23.0

1 1