- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] assist_result_client: fix bisect email report format
by Cao Xueliang 22 Apr '21

22 Apr '21

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/assist_result_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/assist_result_client.rb b/lib/assist_result_client.rb index 2d2e60d..d05de31 100644 --- a/lib/assist_result_client.rb +++ b/lib/assist_result_client.rb @@ -48,7 +48,7 @@ class AssistResult response = resource.get() return nil unless response.code == 200 - return response.body + return JSON.parse(response.body) end def get_error_messages(job_id, error_id) -- 2.23.0

1 0

[PATCH v3 lkp-tests 1/2] tests: add self-test
by Liu Yinsi 22 Apr '21

22 Apr '21

output: send self-test report email, the email body like this Dear Liu Yinsi: Your self-test groud_id=selftest job result is: kvcount.job_state=abnormal: 1 kvcount.job_state=failed: 6 kvcount.job_state=finished: 8 raw.id.[job_state=abnormal]: ["z9.91"] raw.id.[job_state=failed]: ["z9.85","z9.87","z9.88","z9.89","z9.86","z9.84"] raw.id.[job_state=finished]: ["z9.90","z9.96","z9.97","z9.92","z9.94","z9.93","z9.95","z9.98"] Regards Compass-CI Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- tests/self-test | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tests/self-test diff --git a/tests/self-test b/tests/self-test new file mode 100644 index 000000000..cb06b7226 --- /dev/null +++ b/tests/self-test @@ -0,0 +1,28 @@ +#!/bin/bash + +. $LKP_SRC/lib/email.sh + +submit_args=( + "testbox=dc-8g cci-depends.benchmark=sshd cci-depends.yaml" + "testbox=dc-8g borrow-1h.yaml runtime=1m" + "testbox=vm-2p8g borrow-1h.yaml runtime=1m" + ) + +submit_one() +{ + args="$1" + submit_result=$(submit -m $args group_id=selftest) +} + +submit_all() +{ + for args in "${submit_args[@]}" + do + submit_one "$args" + done + + job_state=$(es-jobs group_id=selftest | grep job_state) +} + +submit_all +send_email selftest -- 2.23.0

2 1

[PATCH lkp-tests] change 20.03 to 20.03-sp1
by Bai Jing 22 Apr '21

22 Apr '21

Signed-off-by: Bai Jing <799286817(a)qq.com> --- pkg/openeuler_docker/PKGBUILD | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkg/openeuler_docker/PKGBUILD b/pkg/openeuler_docker/PKGBUILD index 6a1190718..2ca55bcb4 100644 --- a/pkg/openeuler_docker/PKGBUILD +++ b/pkg/openeuler_docker/PKGBUILD @@ -3,20 +3,15 @@ pkgver=1.0 pkgrel=1 pkgdesc="openeuler docker image" arch=('i386' 'x86_64') -url="https://repo.openeuler.org/openEuler-20.03-LTS/docker_img" +url="https://repo.openeuler.org/openEuler-20.03-LTS-SP1/docker_img" license=('GPL') -source=("https://repo.openeuler.org/openEuler-20.03-LTS/docker_img/aarch64/openEuler…") -md5sums=('6aa300910c9f9040b725939fb80e8121') +source=("https://repo.openeuler.org/openEuler-20.03-LTS-SP1/docker_img/aarch64/openE…") +md5sums=('ad1149bf617ce6effb0a2eaf0cf692ef') handle_docker_image() { docker load < openEuler-docker.aarch64.tar.xz - docker run -d --name my-openeuler openeuler-20.03-lts:latest - container_id=$(docker ps -aqf 'name=my-openeuler') - docker cp /etc/yum.repos.d/openEuler.repo $container_id:/etc/yum.repos.d/ - docker commit $container_id openeuler-20.03-lts:v1 - docker save -o openeuler-20.03-lts-v1.tar openeuler-20.03-lts:v1 - docker rm -f $container_id + docker save -o openeuler-20.03-lts-v1.tar openeuler-20.03-lts-sp1:latest } package() -- 2.23.0

1 0

[PATCH v2 lkp-tests] add information after disk partitioning
by Bai Jing 22 Apr '21

22 Apr '21

Signed-off-by: Bai Jing <799286817(a)qq.com> --- tests/host-info | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/host-info b/tests/host-info index 86b49cf9a..45df569f4 100755 --- a/tests/host-info +++ b/tests/host-info @@ -55,10 +55,11 @@ get_part() # lrwxrwxrwx 1 root root 10 Sep 2 18:42 ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43944-part3 -> ../../sda3 # lrwxrwxrwx 1 root root 10 Sep 2 18:42 ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43209 -> ../../sdb info=$(ls -l /dev/disk/by-id/ | grep "/$i" | awk '{print $9}' | grep -e "^scsi-" -e "^ata-" -e "^nvme-" | sed 's/-part[0-9]//g') - count=$(echo $info | tr ' ' '\n' | wc -l) - partition=$(echo $info | tr ' ' '\n' | uniq) + count=$(echo "$info" | wc -l) + partition=$(echo "$info" | uniq) if [ $count -gt 1 ]; then - parts=$(echo /dev/disk/by-id/$partition-part*) + parts=$(ls /dev/disk/by-id/$partition-part*) + echo " -" /dev/disk/by-id/$partition for i in $parts do echo " -" $i -- 2.23.0

1 0

[PATCH v2 lkp-tests 1/2] tests: add self-test
by Liu Yinsi 22 Apr '21

22 Apr '21

output: send self-test report email, the email body like this Dear Liu Yinsi: Your self-test groud_id=selftest job result is: kvcount.job_state=abnormal: 1 kvcount.job_state=failed: 6 kvcount.job_state=finished: 8 raw.id.[job_state=abnormal]: ["z9.91"] raw.id.[job_state=failed]: ["z9.85","z9.87","z9.88","z9.89","z9.86","z9.84"] raw.id.[job_state=finished]: ["z9.90","z9.96","z9.97","z9.92","z9.94","z9.93","z9.95","z9.98"] Regards Compass-CI Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- tests/self-test | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tests/self-test diff --git a/tests/self-test b/tests/self-test new file mode 100644 index 000000000..933e1fa4b --- /dev/null +++ b/tests/self-test @@ -0,0 +1,27 @@ +#!/bin/bash + +. $LKP_SRC/lib/email.sh + +submit_args=( + "testbox=dc-8g cci-depends.benchmark=sshd cci-depends.yaml" + "testbox=dc-8g borrow-1h.yaml runtime=1m" + "testbox=vm-2p8g borrow-1h.yaml runtime=1m" + ) + +submit_one() +{ + submit_result=$(submit -m $args group_id=selftest) +} + +submit_all() +{ + for args in "${submit_args[@]}" + do + submit_one $args + done + + job_state=$(es-jobs group_id=selftest | grep job_state) +} + +submit_all +send_email selftest -- 2.23.0

1 1

[PATCH v3 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 lkp-tests] add information after disk partitioning
by Bai Jing 22 Apr '21

22 Apr '21

Signed-off-by: Bai Jing <799286817(a)qq.com> --- tests/host-info | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/host-info b/tests/host-info index 86b49cf9a..af0ab5777 100755 --- a/tests/host-info +++ b/tests/host-info @@ -58,7 +58,8 @@ get_part() count=$(echo $info | tr ' ' '\n' | wc -l) partition=$(echo $info | tr ' ' '\n' | uniq) if [ $count -gt 1 ]; then - parts=$(echo /dev/disk/by-id/$partition-part*) + parts=$(ls /dev/disk/by-id/$partition-part*) + echo " -" /dev/disk/by-id/$partition for i in $parts do echo " -" $i -- 2.23.0

2 2

[PATCH lkp-tests] tests: add self-test
by Liu Yinsi 22 Apr '21

22 Apr '21

output: send self-test report email, the email body like this kvcount.job_state=abnormal: 1 kvcount.job_state=failed: 6 kvcount.job_state=finished: 4 raw.id.[job_state=abnormal]: ["z9.91"] raw.id.[job_state=failed]: ["z9.85","z9.87","z9.88","z9.89","z9.86","z9.84"] raw.id.[job_state=finished]: ["z9.90","z9.92","z9.93","z9.94"] Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- tests/self-test | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/self-test diff --git a/tests/self-test b/tests/self-test new file mode 100644 index 000000000..316293714 --- /dev/null +++ b/tests/self-test @@ -0,0 +1,35 @@ +#!/bin/bash + +submit_args=( + "testbox=dc-8g cci-depends.benchmark=sshd cci-depends.yaml" + "testbox=dc-8g borrow-1h.yaml runtime=1m" + "testbox=vm-2p8g borrow-1h.yaml runtime=1m" + ) + +submit_one() +{ + submit_result=$(submit -m $args group_id=selftest) +} + +submit_all() +{ + for args in "${submit_args[@]}" + do + submit_one $args + done +} + +mail() +{ + job_state=$(es-jobs group_id=selftest | grep job_state) + email_content="To: $my_email +Subject: [NOTIFY Compass-CI] Self-test report + +$job_state +" + +curl -XPOST "${SEND_MAIL_HOST:-$LKP_SERVER}:${SEND_MAIL_PORT:-10001}/send_mail_text" -d "$email_content" +} + +submit_all +mail -- 2.23.0

3 4

[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