- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests 2/3] sshd: send emails to provide login services for users
by Zhang Yale 30 Sep '20

30 Sep '20

Signed-off-by: Zhang Yale <ylzhangah(a)qq.com> Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- daemon/sshd | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/daemon/sshd b/daemon/sshd index d1fcae52..35809ffe 100755 --- a/daemon/sshd +++ b/daemon/sshd @@ -3,11 +3,9 @@ # email # uuid +. $LKP_SRC/lib/transfer_port.sh . $LKP_SRC/lib/http.sh -sshr_ip=$LKP_SERVER -sshr_port=5050 - run_ssh() { [ -n "$pub_key" ] || return @@ -17,49 +15,46 @@ run_ssh() systemctl start sshd } -compose_email() +data_success() { - deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") - if [ -n $port ]; then - data="To: $email + data="To: $email Subject: [NOTIFY compass-ci] $testbox ready to use Dear $user_name: Thanks for your participation in software ecosystem! According to your application, $testbox has been provisioned. - Please use the following command to login: + The datails are as follows: - ssh root(a)api.compass-ci.openeuler.org -p $port + login: ssh root(a)api.compass-ci.openeuler.org -p $port + Due time: $deadline Regards -compassi-ci +compass-ci " - else - data="To: $email +} + +data_failure() +{ + data="To: $email Subject: [NOTIFY compass-ci] Applying $testbox failed Dear $user_name: - Sorry to inform you than your application failed. - - You may need to wait sometime and then have a second try. + Sorry to inform you that your application failed. + You may need to wait for a while and then have a second try. Regards compass-ci " - fi } -get_port() +compose_email() { - [ -n "$uuid" ] || return - for i in $(seq 1 10) - do - port=$(($(date +%s%N)%10+11333)) - ssh -o StrictHostKeyChecking=no -o ExitOnForwardFailure=yes -Nf -R $port:$PUB_IP:22 sshr@"$sshr_ip" -p "$sshr_port" > out 2>&1 - [ -z "`grep -i "error" out`" ] || continue - return "$port" - break - done + deadline=$(date -d "+$runtime seconds" +"%Y-%m-%d %H:%M:%S") + if [ -n "$port" ]; then + data_success + else + data_failure + fi } run_email() @@ -71,6 +66,6 @@ run_email() } run_ssh -get_port +port=$(get_port) report_ssh_port $port run_email -- 2.23.0

1 0

[PATCH lkp-tests] fix: run-ipconfug: delete the ntpdate
by Wang Chenglong 30 Sep '20

30 Sep '20

the run_ntpdate function in bootstrap.sh here run ntpdate command is unnecessary Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- bin/run-ipconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/run-ipconfig b/bin/run-ipconfig index ad2a9808..0f80feaf 100755 --- a/bin/run-ipconfig +++ b/bin/run-ipconfig @@ -20,4 +20,3 @@ read_ip() [ -n "$IP" ] || read_ip configure_networking -ntpdate -u ntp.api.bz -- 2.23.0

1 0

[PATCH lkp-tests] fix: lib/bootstrap.sh: ntpdate from $LKP_SERVER
by Wang Chenglong 30 Sep '20

30 Sep '20

befor: [ "$LKP_SERVER"=inn ] || return ntpdate -b $LKP_SERVER the ntpdate command can't run after: [ -n "$LKP_SERVER" ] || return ntpdate -b $LKP_SERVER now, if $LKP_SERVER is ok, it can synchronised the time Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- lib/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index f8a98de6..0be7ed3b 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -188,7 +188,7 @@ clearlinux_timesync() run_ntpdate() { [ -z "$NO_NETWORK" ] || return - [ "$LKP_SERVER" = inn ] || return + [ -n "$LKP_SERVER" ] || return is_clearlinux && clearlinux_timesync && return [ -x '/usr/sbin/ntpdate' ] || return -- 2.23.0

1 0

[PATCH compass-ci] container: manjaro: fix dependency issues
by Liu Yinsi 30 Sep '20

30 Sep '20

When build manjaro, error message as follows: util-linux-libs and libutil-linux are in conflict. Remove libutil-linux? [y/N] util-linux-libs and libutil-linux are in conflict error: unresolvable package conflicts detected error: failed to prepare transaction (conflicting dependencies) When installing packages in Arch, do not run pacman -Sy package_name instead of pacman -Syu package_name, as this could lead to dependency issues. See https://wiki.archlinux.org/index.php/Pacman Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/manjaro/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/manjaro/Dockerfile b/container/manjaro/Dockerfile index f6cec48..48c5ee6 100644 --- a/container/manjaro/Dockerfile +++ b/container/manjaro/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER Wu Fenguang <wfg(a)mail.ustc.edu.cn> COPY root / RUN chmod 755 /etc /etc/pacman.d -RUN pacman --needed --noprogressbar --noconfirm -Sy && \ +RUN pacman --needed --noprogressbar --noconfirm -Syu && \ pacman --needed --noprogressbar --noconfirm -S bash zsh git openssh rsync make gcc tzdata sudo coreutils util-linux vim RUN ssh-keygen -t rsa -P '' -f /etc/ssh/ssh_host_rsa_key -- 2.23.0

1 0

[PATCH v2 compass-ci] feat: helper: snapshot of taskqueue
by Tong Qunfeng 30 Sep '20

30 Sep '20

Give a snapshot information about taskqueue (data at redis sorted set queue "queues/id2content"). It will generate a file named taskqueue_snap_yyyymmdd.md. snapshot content examples: |id---|add_time----------|current queue name| 14703, 2020-07-22 14:33, sched/vm-hi1620-2p8g-xxx/in_process 14831, 2020-07-22 17:51, sched/vm-hi1620-2p8g-xxx/in_process crystal.89630, 2020-09-23 11:19, sched/vm-hi1620-2p8g/in_process crystal.89667, 2020-09-23 11:20, sched/vm-hi1620-2p8g/in_process Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- .../helper/redis_op_gc/taskqueue_snap.rb | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 user-client/helper/redis_op_gc/taskqueue_snap.rb diff --git a/user-client/helper/redis_op_gc/taskqueue_snap.rb b/user-client/helper/redis_op_gc/taskqueue_snap.rb new file mode 100755 index 0000000..f0a7034 --- /dev/null +++ b/user-client/helper/redis_op_gc/taskqueue_snap.rb @@ -0,0 +1,56 @@ +#!/usr/bin/env ruby + +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# frozen_string_literal: true + +require 'json' +require_relative './basic_env' + +if !ARGV.empty? + puts 'Usage:' + puts "input: #{__FILE__}" + puts 'output: taskqueue_snap_yyyymmdd.md' + puts ' # id, first add time, current queue' + puts ' # 14703, 2020-07-22 14:33, sched/vm-hi1620-2p8g-xxx/in_process' + puts ' # 14831, 2020-07-22 17:51, sched/vm-hi1620-2p8g-xxx/in_process' + puts ' # crystal.89630, 2020-09-23 11:19, sched/vm-hi1620-2p8g/in_process' + puts ' # crystal.89667, 2020-09-23 11:20, sched/vm-hi1620-2p8g/in_process' + exit +end + +# redis hash key "queues/id2content" is used by taskqueue +cmd = "#{CMD_BASE} queues/id2content , hgetall" +result = `#{cmd}`.chomp +results = result.split("\n") + +task_info = [] + +# format time to "2020-09-29 14:23" +i = 0 +task_num = results.size / 2 +while i < task_num + task_id = results[i] + task_content = JSON.parse(results[i + 1]) + + time = task_content['add_time'] + task_content['add_time'] = Time.at(time.to_f).strftime('%Y-%m-%d %H:%M') unless time.nil? + + time = task_content['move_time'] + task_content['move_time'] = Time.at(time.to_f).strftime('%Y-%m-%d %H:%M') unless time.nil? + + task_info << { 'id' => task_id, 'value' => task_content } + + i += 2 + set_progress(i, task_num) +end + +# sort and put short information to file. +task_info.sort! { |a, b| a['value']['add_time'] <=> b['value']['add_time'] } +today = Time.now.strftime('%Y%m%d') +File.open("taskqueue_snap_#{today}.md", 'w') do |f| + task_info.each do |task| + f.write(task['id'] + ', ' + task['value']['add_time'] \ + + ', ' + task['value']['queue'] + "\n") + end +end -- 2.23.0

2 2

[PATCH compass-ci 3/4] sparrow: start the firewall in adapting openeuler
by Hu Xuejiao 30 Sep '20

30 Sep '20

When firewalld is inactive, return code of 'systemctl status firewalld' will be 3, and install-tiny has set -e, so this will cause this process exit. Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 092c4ca..831c1a3 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -12,15 +12,23 @@ iptables -I FORWARD 1 -j ACCEPT iptables -t nat -A POSTROUTING -o "$PUB_IFACE" -s $BR0_SUBNET -j MASQUERADE iptables -t nat -A POSTROUTING -o $BR0_IFACE -d $BR0_SUBNET -j MASQUERADE -systemctl status firewalld | grep -q "running" && { +command -v firewall-cmd > /dev/null || { + echo "firewalld.service could not be found" + exit 0 +} + +systemctl start firewalld +[ "$(systemctl is-active firewalld)" == "active" ] || { + echo "start firewalld.service failed" + exit 0 +} - DOCKER0_IFACE=docker0 - DOCKER0_SUBNET=172.17.0.0/16 +DOCKER0_IFACE=docker0 +DOCKER0_SUBNET=172.17.0.0/16 - iptables -t nat -A POSTROUTING -o $PUB_IFACE -s $DOCKER0_SUBNET -j MASQUERADE - iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERADE +iptables -t nat -A POSTROUTING -o $PUB_IFACE -s $DOCKER0_SUBNET -j MASQUERADE +iptables -t nat -A POSTROUTING -o $DOCKER0_IFACE -d $DOCKER0_SUBNET -j MASQUERADE - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" - firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -} +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$DOCKER0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=$BR0_SUBNET accept" +firewall-cmd --zone=public --add-rich-rule="rule family=ipv4 source address=0.0.0.0/32 accept" -- 2.23.0

3 2

[PATCH lab-z9] servers add disks, hosts file should update
by Zhang Dewan 30 Sep '20

30 Sep '20

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a11 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a24 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a25 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a66 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a67 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a68 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a69 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a70 | 19 ------------------- hosts/taishan200-2280-2s48p-256g--a71 | 13 ------------- hosts/taishan200-2280-2s64p-256g--a10 | 20 -------------------- hosts/taishan200-2280-2s64p-256g--a3 | 25 ------------------------- hosts/taishan200-2280-2s64p-256g--a4 | 25 ------------------------- hosts/taishan200-2280-2s64p-256g--a8 | 16 ---------------- hosts/taishan200-2280-2s64p-256g--a9 | 17 ----------------- 14 files changed, 268 deletions(-) delete mode 100644 hosts/taishan200-2280-2s48p-256g--a11 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a24 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a25 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a66 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a67 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a68 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a69 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a70 delete mode 100644 hosts/taishan200-2280-2s48p-256g--a71 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a10 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a3 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a4 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a8 delete mode 100644 hosts/taishan200-2280-2s64p-256g--a9 diff --git a/hosts/taishan200-2280-2s48p-256g--a11 b/hosts/taishan200-2280-2s48p-256g--a11 deleted file mode 100644 index 9c0224e..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a11 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8891431-part1 - - /dev/disk/by-id/scsi-350000399b8890e09 - - /dev/disk/by-id/scsi-350000399b8890cd1 - - /dev/disk/by-id/scsi-350000399b8727929 -mac_addr: - - cc:05:77:ab:97:62 - - cc:05:77:ab:97:63 - - cc:05:77:ab:97:64 - - cc:05:77:ab:97:65 - - cc:05:77:ab:97:66 - - cc:05:77:ab:97:67 - - cc:05:77:ab:97:68 - - cc:05:77:ab:97:69 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a24 b/hosts/taishan200-2280-2s48p-256g--a24 deleted file mode 100644 index 7dda921..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a24 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8917d59 - - /dev/disk/by-id/scsi-350000399b891790d - - /dev/disk/by-id/scsi-350000399b89185d9 - - /dev/disk/by-id/scsi-350000399b8917ef1 -mac_addr: - - 44:67:47:c9:d8:f4 - - 44:67:47:c9:d8:f5 - - 44:67:47:c9:d8:f6 - - 44:67:47:c9:d8:f7 - - 44:67:47:c9:d8:f8 - - 44:67:47:c9:d8:f9 - - 44:67:47:c9:d8:fa - - 44:67:47:c9:d8:fb -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a25 b/hosts/taishan200-2280-2s48p-256g--a25 deleted file mode 100644 index 5d075b9..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a25 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88b4499 - - /dev/disk/by-id/scsi-350000399b88b4455 - - /dev/disk/by-id/scsi-350000399b88b442d - - /dev/disk/by-id/scsi-350000399b88b44f9 -mac_addr: - - 44:67:47:c9:ea:08 - - 44:67:47:c9:ea:09 - - 44:67:47:c9:ea:0a - - 44:67:47:c9:ea:0b - - 44:67:47:c9:ea:0c - - 44:67:47:c9:ea:0d - - 44:67:47:c9:ea:0e - - 44:67:47:c9:ea:0f -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a66 b/hosts/taishan200-2280-2s48p-256g--a66 deleted file mode 100644 index 88ef791..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a66 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-35000c5009a671773 - - /dev/disk/by-id/scsi-35000c5009a690c53 - - /dev/disk/by-id/scsi-35000c5009a6713fb - - /dev/disk/by-id/scsi-35000c5009a65963f -mac_addr: - - 5c:e8:83:31:c8:8e - - 5c:e8:83:31:c8:8f - - 5c:e8:83:31:c8:90 - - 5c:e8:83:31:c8:91 - - 5c:e8:83:31:c8:92 - - 5c:e8:83:31:c8:93 - - 5c:e8:83:31:c8:94 - - 5c:e8:83:31:c8:95 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a67 b/hosts/taishan200-2280-2s48p-256g--a67 deleted file mode 100644 index 97ea498..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a67 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88aed21 - - /dev/disk/by-id/scsi-350000399b88af325 - - /dev/disk/by-id/scsi-350000399b88af699 - - /dev/disk/by-id/scsi-350000399b88af421 -mac_addr: - - 44:67:47:c9:e2:2c - - 44:67:47:c9:e2:2d - - 44:67:47:c9:e2:2e - - 44:67:47:c9:e2:2f - - 44:67:47:c9:e2:30 - - 44:67:47:c9:e2:31 - - 44:67:47:c9:e2:32 - - 44:67:47:c9:e2:33 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a68 b/hosts/taishan200-2280-2s48p-256g--a68 deleted file mode 100644 index f3d50f4..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a68 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b8909f81 - - /dev/disk/by-id/scsi-350000399b8909f79 - - /dev/disk/by-id/scsi-350000399b8909605 - - /dev/disk/by-id/scsi-350000399b8909b85 -mac_addr: - - 84:46:fe:89:b6:e6 - - 84:46:fe:89:b6:e7 - - 84:46:fe:89:b6:e8 - - 84:46:fe:89:b6:e9 - - 84:46:fe:89:b6:ea - - 84:46:fe:89:b6:eb - - 84:46:fe:89:b6:ec - - 84:46:fe:89:b6:ed -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a69 b/hosts/taishan200-2280-2s48p-256g--a69 deleted file mode 100644 index 9e5734e..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a69 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b88be92d - - /dev/disk/by-id/scsi-350000399b88befc5 - - /dev/disk/by-id/scsi-350000399b88be701 - - /dev/disk/by-id/scsi-350000399b88bea5d -mac_addr: - - 44:67:47:c9:d9:4e - - 44:67:47:c9:d9:4f - - 44:67:47:c9:d9:50 - - 44:67:47:c9:d9:51 - - 44:67:47:c9:d9:52 - - 44:67:47:c9:d9:53 - - 44:67:47:c9:d9:54 - - 44:67:47:c9:d9:55 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a70 b/hosts/taishan200-2280-2s48p-256g--a70 deleted file mode 100644 index 0dd8208..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a70 +++ /dev/null @@ -1,19 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -nr_hdd_partitions: 4 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399b890931d - - /dev/disk/by-id/scsi-350000399b8909d79 - - /dev/disk/by-id/scsi-350000399b8909ac5 - - /dev/disk/by-id/scsi-350000399b8909c99 -mac_addr: - - 84:46:fe:89:b7:22 - - 84:46:fe:89:b7:23 - - 84:46:fe:89:b7:24 - - 84:46:fe:89:b7:25 - - 84:46:fe:89:b7:26 - - 84:46:fe:89:b7:27 - - 84:46:fe:89:b7:28 - - 84:46:fe:89:b7:29 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s48p-256g--a71 b/hosts/taishan200-2280-2s48p-256g--a71 deleted file mode 100644 index dde6205..0000000 --- a/hosts/taishan200-2280-2s48p-256g--a71 +++ /dev/null @@ -1,13 +0,0 @@ -nr_node: 4 -nr_cpu: 96 -memory: 256G -mac_addr: - - 44:67:47:d7:6d:e6 - - 44:67:47:d7:6d:e7 - - 44:67:47:d7:6d:e8 - - 44:67:47:d7:6d:e9 - - 44:67:47:d7:6d:ea - - 44:67:47:d7:6d:eb - - 44:67:47:d7:6d:ec - - 44:67:47:d7:6d:ed -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a10 b/hosts/taishan200-2280-2s64p-256g--a10 deleted file mode 100644 index 2784a67..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a10 +++ /dev/null @@ -1,20 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 1 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44333 -mac_addr: - - 44:67:47:86:2c:95 - - 44:67:47:86:2c:96 - - 44:67:47:86:2c:97 - - 44:67:47:86:2c:98 - - ac:b3:b5:1e:d6:8b - - ac:b3:b5:1e:d6:8c - - ac:b3:b5:1e:d6:8d - - ac:b3:b5:1e:d6:8e - - ac:b3:b5:1e:d5:4b - - ac:b3:b5:1e:d5:4c - - ac:b3:b5:1e:d5:4d - - ac:b3:b5:1e:d5:4e -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a3 b/hosts/taishan200-2280-2s64p-256g--a3 deleted file mode 100644 index 4bfa8ed..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a3 +++ /dev/null @@ -1,25 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_hdd_partitions: 1 -nr_ssd_partitions: 3 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399981347d5 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part1 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part2 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43895-part3 -mac_addr: - - 68:4a:ae:ca:e8:ca - - 68:4a:ae:ca:e8:cb - - 68:4a:ae:ca:e8:cc - - 68:4a:ae:ca:e8:cd - - ac:b3:b5:1f:74:de - - ac:b3:b5:1f:74:df - - ac:b3:b5:1f:74:e0 - - ac:b3:b5:1f:74:e1 - - ac:b3:b5:1f:74:ee - - ac:b3:b5:1f:74:ef - - ac:b3:b5:1f:74:f0 - - ac:b3:b5:1f:74:f1 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a4 b/hosts/taishan200-2280-2s64p-256g--a4 deleted file mode 100644 index e0062d9..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a4 +++ /dev/null @@ -1,25 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_hdd_partitions: 1 -nr_ssd_partitions: 3 -hdd_partitions: - - /dev/disk/by-id/scsi-350000399c802cfb9 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part1 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part2 - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43892-part3 -mac_addr: - - 68:4a:ae:ca:e8:a2 - - 68:4a:ae:ca:e8:a3 - - 68:4a:ae:ca:e8:a4 - - 68:4a:ae:ca:e8:a5 - - ac:b3:b5:1f:74:6e - - ac:b3:b5:1f:74:6f - - ac:b3:b5:1f:74:70 - - ac:b3:b5:1f:74:71 - - ac:b3:b5:1f:7d:4e - - ac:b3:b5:1f:7d:4f - - ac:b3:b5:1f:7d:50 - - ac:b3:b5:1f:7d:51 -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a8 b/hosts/taishan200-2280-2s64p-256g--a8 deleted file mode 100644 index 9386034..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a8 +++ /dev/null @@ -1,16 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 256G -nr_ssd_partitions: 1 -ssd_partitions: - - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB43325 -mac_addr: - - 84:46:fe:26:12:f5 - - 84:46:fe:26:12:f6 - - 84:46:fe:26:12:f7 - - 84:46:fe:26:12:f8 - - ac:b3:b5:1e:b6:7b - - ac:b3:b5:1e:b6:7c - - ac:b3:b5:1e:b6:7d - - ac:b3:b5:1e:b6:7e -model_name: Kunpeng-920 diff --git a/hosts/taishan200-2280-2s64p-256g--a9 b/hosts/taishan200-2280-2s64p-256g--a9 deleted file mode 100644 index 19f4d75..0000000 --- a/hosts/taishan200-2280-2s64p-256g--a9 +++ /dev/null @@ -1,17 +0,0 @@ -nr_node: 4 -nr_cpu: 128 -memory: 128G -nr_hdd_partitions: 2 -hdd_partitions: - - /dev/disk/by-id/scsi-35000c500bd6a1347 - - /dev/disk/by-id/scsi-35000c500bd62acb3 -mac_addr: - - cc:05:77:fe:d4:0e - - cc:05:77:fe:d4:0f - - cc:05:77:fe:d4:10 - - cc:05:77:fe:d4:11 - - 44:a1:91:35:1a:70 - - 44:a1:91:35:1a:71 - - 44:a1:91:35:1a:72 - - 44:a1:91:35:1a:73 -model_name: Kunpeng-920 -- 2.23.0

1 0

[PATCH compass-ci] fix: helper: delete_task "-h" option and bugs
by Tong Qunfeng 30 Sep '20

30 Sep '20

when input single task_id, should use "<< task_id" not "<< [task_id]" Signed-off-by: Tong Qunfeng <taxcom(a)tom.com> --- user-client/helper/redis_op_gc/delete_task.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/user-client/helper/redis_op_gc/delete_task.rb b/user-client/helper/redis_op_gc/delete_task.rb index 643d2b3..6534f95 100755 --- a/user-client/helper/redis_op_gc/delete_task.rb +++ b/user-client/helper/redis_op_gc/delete_task.rb @@ -6,17 +6,21 @@ require_relative './force_delete' -if ARGV.empty? +if ARGV.empty? || ARGV.include?("-h") || ARGV.include?("--help") puts "Usage: #{__FILE__} task_id[|task_ids]" puts ' delete special task with [task_id]' - puts ' or delete special task form a [task_ids] file' + puts ' or delete special task from [task_ids] file' + puts "\n--- example ---" + puts " input: #{__FILE__} z9.11734 nolab.11342" + puts 'output: <none>' + puts ' # delete (z9.11734 nolab.11342) at taskqueue and scheduler' exit end task_ids = [] ARGV.each do |id| task_ids += IO.readlines(id) if File.exist?(id) - task_ids << [id] unless File.exist?(id) + task_ids << id unless File.exist?(id) end i = 0 -- 2.23.0

1 0

[PATCH v3 lkp-tests] fix: run-ipconfig: add ntpdat
by Wang Chenglong 30 Sep '20

30 Sep '20

initramfs start, need to synchronize time after get the ip address Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- bin/run-ipconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/run-ipconfig b/bin/run-ipconfig index 0f80feaf..ad2a9808 100755 --- a/bin/run-ipconfig +++ b/bin/run-ipconfig @@ -20,3 +20,4 @@ read_ip() [ -n "$IP" ] || read_ip configure_networking +ntpdate -u ntp.api.bz -- 2.23.0

2 2

[PATCH v4 compass-ci 6/7] container/mail-robot: conf/sources.list
by Luan Shengde 30 Sep '20

30 Sep '20

sources list file for the image install packages Signed-off-by: Luan Shengde <luanshengde2(a)huawei.com> --- container/mail-robot/conf/sources.list | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 container/mail-robot/conf/sources.list diff --git a/container/mail-robot/conf/sources.list b/container/mail-robot/conf/sources.list new file mode 100644 index 0000000..8179e01 --- /dev/null +++ b/container/mail-robot/conf/sources.list @@ -0,0 +1,9 @@ +deb [trusted=yes] http://mirrors.163.com/debian/ buster main non-free contrib +deb [trusted=yes] http://mirrors.163.com/debian/ buster-updates main non-free contrib +deb [trusted=yes] http://mirrors.163.com/debian/ buster-backports main non-free contrib +deb [trusted=yes] http://mirrors.163.com/debian-security/ buster/updates main non-free contrib + +deb-src [trusted=yes] http://mirrors.163.com/debian/ buster main non-free contrib +deb-src [trusted=yes] http://mirrors.163.com/debian/ buster-updates main non-free contrib +deb-src [trusted=yes] http://mirrors.163.com/debian/ buster-backports main non-free contrib +deb-src [trusted=yes] http://mirrors.163.com/debian-security/ buster/updates main non-free contrib -- 2.23.0

1 0

2024

2023

2022

2021

2020

Compass-ci