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

[PATCH v2 lkp-tests 2/2] lib/email.sh: add selftest_content()
by Liu Yinsi 22 Apr '21

22 Apr '21

This will send email to user when finish selftest. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- lib/email.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/email.sh b/lib/email.sh index 4f1055033..24ef7bb64 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -80,6 +80,22 @@ Compass-CI " } +selftest_content() +{ + email_content="To: $my_email +Subject: [NOTIFY Compass-CI] Self-test report + +Dear $my_name: + + Your self-test groud_id=selftest job result is: + + $job_state + +Regards +Compass-CI +" +} + send_email() { local subject=$1 -- 2.23.0

1 0

[PATCH compass-ci] contianer/register-accounts: add env ES_USER ES_PASSWORD
by Li Yuanchao 22 Apr '21

22 Apr '21

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- container/defconfig.rb | 1 + container/register-accounts/start | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/container/defconfig.rb b/container/defconfig.rb index f090351..0a8e4d5 100755 --- a/container/defconfig.rb +++ b/container/defconfig.rb @@ -11,6 +11,7 @@ def cci_defaults '/etc/compass-ci/service/*.yaml', '/etc/compass-ci/accounts/*.yaml', '/etc/compass-ci/register/*.yaml', + '/etc/compass-ci/*.yaml', "#{ENV['HOME']}/.config/compass-ci/defaults/*.yaml"]).each do |file| hash.update YAML.load_file(file) || {} end diff --git a/container/register-accounts/start b/container/register-accounts/start index c2acc75..ad70048 100755 --- a/container/register-accounts/start +++ b/container/register-accounts/start @@ -9,6 +9,8 @@ require_relative '../defconfig.rb' names = Set.new %w[ ES_HOST ES_PORT + ES_USER + ES_PASSWORD lab ] @@ -25,7 +27,7 @@ cmd = %w[ ] + env + %W[ -e CCI_SRC=#{DEFAULT_CCI} -v #{ENV['CCI_SRC']}:#{DEFAULT_CCI} - -v /etc/compass-ci/register:/etc/compass-ci/register:ro + -v /etc/compass-ci:/etc/compass-ci:ro -v /etc/localtime:/etc/localtime:ro -w #{DEFAULT_CCI}/container/register-accounts register-accounts -- 2.23.0

1 0

[PATCH lkp-tests 4/4] distro/depends: depends package file for compile installing mysql
by Luan Shengde 22 Apr '21

22 Apr '21

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- distro/depends/mysql-8-0-20-dev | 257 ++++++++++++++++++++++++++++++++ 1 file changed, 257 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..2da6fc930 --- /dev/null +++ b/distro/depends/mysql-8-0-20-dev @@ -0,0 +1,257 @@ +make +bison +ncurses +ncurses-devel +libaio-devel +openssl +openssl-devel +gmp +gmp-devel +mpfr +mpfr-devel +libmpc +libmpc-devel +wget +tar +gcc +gcc-c++ +git +rpcgen +cmake +bison +bison-devel +m4 +libtirpc-devel +openldap-devel +protobuf +protobuf-devel +protobuf-lite-devel +dnf-plugins-core +rpm-build +asciidoc +autoconf +automake +bzip2-devel +curl-devel +desktop-file-utils +emacs +expat-devel +flex +gcc-gfortran +gdb +glib2-devel +gnutls-devel +gpm-devel +libX11-devel +libacl-devel +libdb-devel +libpsl-devel +libtool +lksctp-tools-devel +pcre-devel +perl-generators +policycoreutils +python2-devel +python2-setuptools +python3-devel +unixODBC-devel +util-linux-devel +xmlto +xz-devel +cracklib-devel +gpgme-devel +guile-devel +jsoncpp-devel +libarchive-devel +libidn2-devel +libmetalink-devel +libsecret-devel +libtool-devel +libuv-devel +perl-HTTP-Daemon +perl-MailTools +python2-google-apputils +python3-google-apputils +python3-sphinx +qt5-qtbase-devel +rhash-devel +texinfo +ModemManager-glib +SDL +adobe-mappings-cmap +adobe-mappings-cmap-lang +adobe-mappings-pdf +alsa-lib +avahi-glib +babeltrace +boost-regex +cdparanoia-libs +ctags +dbus-glib +dejavu-fonts +diffutils +docbook-dtds +docbook-style-xsl +emacs-common +enchant +fftw-libs-double +fontconfig-devel +freeglut +freetype-devel +gd +gdb-headless +geoclue2 +ghostscript +giflib +glew +google-droid-sans-fonts +gpm +graphviz +gstreamer1 +gstreamer1-plugins-base +hunspell +hunspell-en +hyphen +iso-codes +jbig2dec +libXau-devel +libXdamage-devel +libXext-devel +libXfixes-devel +libXv +libXxf86misc +libXxf86vm +libXxf86vm-devel +libattr-devel +libdrm +libdrm-devel +libffi-devel +libfontenc +libgfortran +libglvnd +libglvnd-devel +libgpg-error-devel +libidn +libijs +libnotify +libogg +libpaper +libpng-devel +librsvg2 +libtasn1-devel +libtheora +libvisual +libvorbis +libwebp +libxcb-devel +libxshmfence +libxslt +linuxconsoletools +lksctp-tools +mailcap +mcpp +mesa-demos +mesa-libEGL +mesa-libEGL-devel +mesa-libGL +mesa-libGL-devel +mesa-libGLU +mesa-libgbm +mesa-libglapi +nettle-devel +openjpeg2 +opus +orc +p11-kit-devel +perl-Encode-Locale +perl-Fedora-VSP +perl-HTTP-Date +perl-HTTP-Message +perl-IO-HTML +perl-IO-Socket-SSL +perl-LWP-MediaTypes +perl-Net-SSLeay +perl-Text-Unidecode +perl-TimeDate +perl-URI +python2 +python2-debug +python2-help +python2-six +python2-tkinter +python2-tools +python3-babel +python3-chardet +python3-idna +python3-jinja2 +python3-markupsafe +python3-pysocks +python3-pytz +python3-requests +python3-rpm-generators +python3-urllib3 +qt-settings +qt5-qtbase +qt5-qtbase-common +sgml-common +source-highlight +tk +unixODBC +urw-base35-bookman-fonts +urw-base35-c059-fonts +urw-base35-d050000l-fonts +urw-base35-fonts +urw-base35-fonts-common +urw-base35-gothic-fonts +urw-base35-nimbus-mono-ps-fonts +urw-base35-nimbus-roman-fonts +urw-base35-nimbus-sans-fonts +urw-base35-p052-fonts +urw-base35-standard-symbols-ps-fonts +urw-base35-z003-fonts +webkit2gtk3 +webkit2gtk3-jsc +woff2 +xcb-util +xorg-x11-font-utils +xorg-x11-fonts +xorg-x11-proto-devel +xorg-x11-server-utils +OpenEXR-libs +gc-devel +ilmbase +libwmf +perl-Class-Inspector +perl-Net-SMTP-SSL +perl-Unicode-EastAsianWidth +perl-libintl-perl +python-sphinx-locale +python2-dateutil +python2-gflags +python2-pytz +python3-docutils +python3-funcsigs +python3-gflags +python3-imagesize +python3-mock +python3-packaging +python3-pbr +python3-pygments +python3-snowballstemmer +python3-sphinx-theme-alabaster +python3-sphinx_rtd_theme +python3-sphinxcontrib-websupport +python3-sqlalchemy +python3-whoosh +qt5-qtbase-gui +qt5-rpm-macros +xcb-util-image +xcb-util-keysyms +xcb-util-renderutil +xcb-util-wm +fontawesome-fonts +lato-fonts +python2-pip +ImageMagick +perl-File-ShareDir +google-roboto-slab-fonts -- 2.23.0

2 2

[PATCH v2 lkp-tests] jobs: add job yaml file for building/testing mysql
by Luan Shengde 22 Apr '21

22 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..bf93ecdab --- /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: root +mysql_host: localhost +mysql_port: 3306 +mysql_db: sysbench_test +mysql_password: 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 0

[PATCH lkp-tests] jobs/qcow2rootfs-x86_64.yaml: the yaml for qcow2rootfs
by Wang Chenglong 22 Apr '21

22 Apr '21

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- jobs/qcow2rootfs-x86_64.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 jobs/qcow2rootfs-x86_64.yaml diff --git a/jobs/qcow2rootfs-x86_64.yaml b/jobs/qcow2rootfs-x86_64.yaml new file mode 100644 index 000000000..1002283a3 --- /dev/null +++ b/jobs/qcow2rootfs-x86_64.yaml @@ -0,0 +1,27 @@ +suite: qcow2rootfs-x86_64 +category: benchmark +qcow2rootfs-x86_64: + + # The related fields about qcow2 image to be used to generate rootfs + # it should be the same as the official provided image name + qcow2_os: + qcow2_arch: + qcow2_version: + + # place the result rootfs related fields + # 1. result rootfs will be placed in the following localtion on the + # remote file server: + # - {remote_file_server}/{rootfs_path}/{iso_os}/{iso_arch}/ + # 2. remote file server protocols current supported: + # - nfs + rootfs_protocol: nfs + rootfs_server: 172.168.131.2 + rootfs_path: os-rw + +# The best host for execution is the x86 OpenEuler system +os: +os_version: +os_arch: +os_mount: +testbox: +queue: -- 2.23.0

1 0

[PATCH lkp-tests] lib/bootstrap.sh: delete history remove code
by Liu Shaofei 22 Apr '21

22 Apr '21

[why] function callend by "is_clearlinux" is not defined, by checking history commit record, the function is removed and the patch codes is removed. [ 63.427966] [ 63.428704] + is_clearlinux [ 63.428705] [ 63.431226] /lkp/lkp/src/lib/bootstrap.sh: line 104: is_clearlinux: command not found [ 63.431228] Signed-off-by: Liu Shaofei <370072077(a)qq.com> --- lib/bootstrap.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index 7983f638e..0bd01198e 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -101,13 +101,13 @@ network_ok() [ "$(cat $i/carrier 2>/dev/null)" = '1' ] && test_ping && return 0 done - is_clearlinux && { - net_devices_link up - - # in case of systemd-networkd.service was masked - systemctl unmask systemd-networkd.service - systemctl start systemd-networkd.service - } +# is_clearlinux && { +# net_devices_link up +# +# # in case of systemd-networkd.service was masked +# systemctl unmask systemd-networkd.service +# systemctl start systemd-networkd.service +# } return 1 } -- 2.23.0

1 0

[PATCH compass-ci] sparrow/0-package: add deps iputils
by Liu Yinsi 22 Apr '21

22 Apr '21

[why] ping command is used in $CCI_SRC/lib/check_public_network.sh Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/0-package/os/centos | 1 + sparrow/0-package/os/debian | 1 + sparrow/0-package/os/openEuler | 1 + 3 files changed, 3 insertions(+) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index b8ef7694..d4d10457 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -25,6 +25,7 @@ pkgs=( wget curl sudo + iputils ) yum install -y --skip-broken "${pkgs[@]}" diff --git a/sparrow/0-package/os/debian b/sparrow/0-package/os/debian index 947cbdc1..6feb9be2 100755 --- a/sparrow/0-package/os/debian +++ b/sparrow/0-package/os/debian @@ -25,6 +25,7 @@ pkgs=( qemu-system-x86 qemu-system-riscv64 sudo + iputils ) apt-get update diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index e742fa13..8cdadd52 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -26,6 +26,7 @@ pkgs=( libvirt curl sudo + iputils ) public_network_ok && { -- 2.23.0

1 0

[PATCH lkp-tests] tests/qcow2rootfs-x86_64: automatically build x86_64 rootfs
by Wang Chenglong 22 Apr '21

22 Apr '21

[Why] automatically build rootfs for x86 from the official QCOW2 image. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100755 tests/qcow2rootfs-x86_64 diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 new file mode 100755 index 000000000..f698fb7ec --- /dev/null +++ b/tests/qcow2rootfs-x86_64 @@ -0,0 +1,80 @@ +#!/bin/bash +# - qcow2_os +# - qcow2_arch +# - qcow2_version +# - rootfs_protocol +# - rootfs_server +# - rootfs_path + +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 + 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 + 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 + +} + +check_url() +{ + export QCOW2_NAME="${qcow2_os}-${qcow2_version}.${qcow2_arch}.qcow2.xz" + + # Since the 21.03 version of OpenEuler's mirror naming format has changed, + # it has been modified. + if [ "${qcow2_version}" == "21.03" ];then + export QCOW2_NAME="${qcow2_os}-${qcow2_version}-${qcow2_arch}.qcow2.xz" + fi + + export QCOW2_URL="https://repo.openeuler.org/${qcow2_os}-${qcow2_version}/virtual_machine_img…" +} + +download_qcow2_img() +{ + export IMG_PATH="/root/qcow2" + mkdir -p ${IMG_PATH} && cd ${IMG_PATH} + [ -f "${IMG_PATH}/${QCOW2_NAME}" ] || { + wget ${QCOW2_URL} || exit 1 + } +} + +mount_os-rw() +{ + export MOUNT_POINT="${IMG_PATH}/mnt" + mkdir ${MOUNT_POINT} + mount -t ${rootfs_protocol} -o rw ${rootfs_server}:/${rootfs_path} ${MOUNT_POINT} +} + +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} +} + +set_resolv_config() +{ + cat >${ROOTFS_PATH}/etc/resolv.conf<<-EOF + nameserver 114.114.114.114 + EOF +} + +set_link() +{ + cd ${MOUNT_POINT}/openeuler/${qcow2_arch} + ln -fs automatic-build/${ROOTFS_DIR} ${qcow2_version}-automatic + + umount ${MOUNT_POINT} + echo $ROOTFS_PATH +} + +set_qcow2rootfs_tools +check_url +download_qcow2_img +mount_os-rw +extract_rootfs +set_resolv_config +set_link -- 2.23.0

1 0

[PATCH compass-ci] container/mail-robot: optimize method
by Luan Shengde 22 Apr '21

22 Apr '21

use File.exist? instead of File.exists? Lint/DeprecatedClassMethods: File.exists? is deprecated in favor of File.exist?. Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/mail-robot/lib/apply-account.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/mail-robot/lib/apply-account.rb b/container/mail-robot/lib/apply-account.rb index d8cb4da4..f64a3de9 100755 --- a/container/mail-robot/lib/apply-account.rb +++ b/container/mail-robot/lib/apply-account.rb @@ -56,7 +56,7 @@ class ApplyAccount @es_port = ES_PORT # email info file for account issuers. - @account_issuer = File.exists?(ENV['ACCOUNT_ISSUER']) ? YAML.load_file(ENV['ACCOUNT_ISSUER']) : {} + @account_issuer = File.exist?(ENV['ACCOUNT_ISSUER']) ? YAML.load_file(ENV['ACCOUNT_ISSUER']) : {} @my_info = {} end -- 2.23.0

1 0

[PATCH compass-ci] scheduler/elasticsearch_client.cr: fix es bug
by Wu Zhende 22 Apr '21

22 Apr '21

<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> <html><head> <title>404 Not Found</title> </head><body> <h1>Not Found</h1> <p>The requested URL was not found on this server.</p> <hr> <address>Apache Server at http Port 80</address> </body></html> Signed-off-by: Wu Zhende <wuzhende666(a)163.com> --- src/scheduler/elasticsearch_client.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler/elasticsearch_client.cr b/src/scheduler/elasticsearch_client.cr index 1ef79a6..0a7bc44 100644 --- a/src/scheduler/elasticsearch_client.cr +++ b/src/scheduler/elasticsearch_client.cr @@ -35,7 +35,7 @@ class Elasticsearch::Client if auth user = ENV["ES_USER"]? password = ENV["ES_PASSWORD"]? - host = "http://#{user}:#{URI.encode_www_form(password)}@#{host}" if user && password + host = "#{user}:#{URI.encode_www_form(password)}@#{host}" if user && password end @client = Elasticsearch::API::Client.new({:host => host, :port => port}) end -- 2.23.0

1 0