- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci] lib/dump_stat.rb: fix name error
by Lu Weitao 26 Mar '21

26 Mar '21

[Why] /home/baijing/compass-ci/lib/dump_stat.rb:171:in `number?': undefined local variable or method `monitor' for DumpStat:Module (NameError) Did you mean? @monitor Signed-off-by: Lu Weitao <luweitaobe(a)163.com> --- lib/dump_stat.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dump_stat.rb b/lib/dump_stat.rb index 1c0695e..de0168e 100644 --- a/lib/dump_stat.rb +++ b/lib/dump_stat.rb @@ -55,7 +55,7 @@ module DumpStat if value.is_a?(String) value = check_string_value(k, value, @monitor) next unless value - return nil unless number?(value, @invalid_records) + return nil unless number?(value, @invalid_records, @record_index, @monitor) value = value.index('.') ? value.to_f : value.to_i elsif value.is_a?(Array) @@ -64,7 +64,7 @@ module DumpStat value[i] = check_string_value(k, value[i], @monitor) next unless value[i] - return nil unless number?(value[i], @invalid_records) + return nil unless number?(value[i], @invalid_records, @record_index, @monitor) value[i] = value[i].index('.') ? value[i].to_f : value[i].to_i valid_stats_verification(k, value[i]) @@ -165,7 +165,7 @@ def check_string_value(key, value, monitor) end # only number is valid -def number?(value, invalid_records) +def number?(value, invalid_records, record_index, monitor) unless value.numeric? invalid_records.push record_index warn_stat "invalid stats value: #{value}", monitor -- 2.23.0

1 0

[PATCH compass-ci 3/3] container/scheduler: fix library libgc.so.1: No such file or directory
by Cao Xueliang 26 Mar '21

26 Mar '21

use the compile env as the runtime env Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/scheduler/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/container/scheduler/Dockerfile b/container/scheduler/Dockerfile index 7fb8e35..229a9c7 100644 --- a/container/scheduler/Dockerfile +++ b/container/scheduler/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -FROM alpine:3.11 +FROM alpine:scheduler-dev RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories @@ -12,10 +12,6 @@ RUN apk add --no-cache 'ruby-dev' \ RUN umask 002 && \ gem sources -r https://rubygems.org/ -a https://gems.ruby-china.com/ && \ - gem install rest-client && \ - gem install activesupport && \ - gem install git && \ - gem install json && \ gem install yaml -- 2.23.0

1 1

[PATCH compass-ci 2/3] container/crystal-shards: update crystal version from 0.33 to 0.35
by Cao Xueliang 26 Mar '21

26 Mar '21

add shard-amqp.yml to shard.yml, delete shard-amqp.yml add crystal-etcd to shard.yml Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/crystal-shards/Dockerfile | 3 --- container/crystal-shards/shard-amqp.yml | 7 ------- container/crystal-shards/shard.yml | 9 ++++++--- 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 container/crystal-shards/shard-amqp.yml diff --git a/container/crystal-shards/Dockerfile b/container/crystal-shards/Dockerfile index 15fe523..d3e321f 100644 --- a/container/crystal-shards/Dockerfile +++ b/container/crystal-shards/Dockerfile @@ -17,8 +17,5 @@ sed -i '99s/arguments\[:id]/arguments\[:id]?/' /usr/share/crystal/app/lib/elast sed -i 's/, Utils.__listify(arguments\[:q].as(String))/ /' /usr/share/crystal/app/lib/elasticsearch-crystal/src/elasticsearch/api/actions/search.cr;\ sed -i '205a \ params.clear' /usr/share/crystal/app/lib/elasticsearch-crystal/src/elasticsearch/api/actions/search.cr; -COPY shard-amqp.yml /usr/share/crystal/app/shard.yml -RUN shards - CMD ["bash"] diff --git a/container/crystal-shards/shard-amqp.yml b/container/crystal-shards/shard-amqp.yml deleted file mode 100644 index aea87cc..0000000 --- a/container/crystal-shards/shard-amqp.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: monitor -version: 0.1.0 - -dependencies: - amqp-client: - github: cloudamqp/amqp-client.cr - version: 0.5.14 diff --git a/container/crystal-shards/shard.yml b/container/crystal-shards/shard.yml index ca8f72e..3466bc5 100644 --- a/container/crystal-shards/shard.yml +++ b/container/crystal-shards/shard.yml @@ -8,7 +8,7 @@ targets: scheduler: main: src/scheduler.cr -crystal: 0.33.0 +crystal: 0.35.0 license: Mulan PSL v2 @@ -17,10 +17,8 @@ dependencies: github: kemalcr/kemal redis: github: stefanwille/crystal-redis - version: ~> 2.5.3 elasticsearch-crystal: github: paktek123/elasticsearch-crystal - version: ~> 0.14 any_merge: github: icyleaf/any_merge branch: master @@ -32,3 +30,8 @@ dependencies: github: z64/rate_limiter singleton: github: waterlink/singleton.cr + etcd: + github: PythonEngineer007/crystal-etcd + branch: master + amqp-client: + github: cloudamqp/amqp-client.cr -- 2.23.0

1 0

[PATCH compass-ci 1/3] container/crystal-base: update alpine version from 3.11 to 3.13
by Cao Xueliang 26 Mar '21

26 Mar '21

need install llvm10 in alpine:3.13. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- container/crystal-base/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container/crystal-base/Dockerfile b/container/crystal-base/Dockerfile index 03fe5e6..633a2ec 100644 --- a/container/crystal-base/Dockerfile +++ b/container/crystal-base/Dockerfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -FROM alpine:3.11 +FROM alpine:3.13 MAINTAINER chief <taxcom(a)tom.com> @@ -10,7 +10,7 @@ ONBUILD RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.hu ONBUILD RUN apk update ONBUILD RUN apk add bash zsh git rsync curl crystal shards tzdata sudo \ yaml-dev openssl-dev ncurses-static g++ make cmake \ - zlib-dev zlib-static openssl-libs-static llvm5 llvm5-dev \ - llvm5-libs llvm5-static musl-dev xz-dev libxml2-dev \ + zlib-dev zlib-static openssl-libs-static llvm10 llvm10-dev \ + llvm10-libs llvm10-static musl-dev xz-dev libxml2-dev \ vim ruby-dev -- 2.23.0

1 0

[PATCH compass-ci] container/result-webdav: add /srv/rpm share dir
by Cui Yili 26 Mar '21

26 Mar '21

Signed-off-by: Cui Yili <2268260388(a)qq.com> --- container/result-webdav/start | 1 + 1 file changed, 1 insertion(+) diff --git a/container/result-webdav/start b/container/result-webdav/start index 2852f24..993f24c 100755 --- a/container/result-webdav/start +++ b/container/result-webdav/start @@ -21,6 +21,7 @@ cmd=( -v /etc/localtime:/etc/localtime:ro -v /srv/result/:/srv/result/ -v /srv/initrd/:/srv/initrd/ + -v /srv/rpm/:/srv/rpm/ -v /srv/cci/build-config/:/srv/cci/build-config/ result-webdav ) -- 2.23.0

1 0

[PATCH lab-z9] add testboxes host-file
by Zhang Dewan 26 Mar '21

26 Mar '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- hosts/taishan200-2280-2s48p-256g--a63 | 6 +++--- hosts/taishan200-2280-2s48p-256g--a64 | 6 +++--- hosts/taishan200-2280-2s48p-256g--a65 | 6 +++--- hosts/taishan200-2280-2s64p-256g--a110 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a112 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a113 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a114 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a116 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a118 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a119 | 19 ++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a124 | 22 +++++++++++++++++++++ hosts/taishan200-2280-2s64p-256g--a39 | 27 ++++++++++++++++++++++++++ 12 files changed, 191 insertions(+), 9 deletions(-) create mode 100644 hosts/taishan200-2280-2s64p-256g--a110 create mode 100644 hosts/taishan200-2280-2s64p-256g--a112 create mode 100644 hosts/taishan200-2280-2s64p-256g--a113 create mode 100644 hosts/taishan200-2280-2s64p-256g--a114 create mode 100644 hosts/taishan200-2280-2s64p-256g--a116 create mode 100644 hosts/taishan200-2280-2s64p-256g--a118 create mode 100644 hosts/taishan200-2280-2s64p-256g--a119 create mode 100644 hosts/taishan200-2280-2s64p-256g--a124 create mode 100644 hosts/taishan200-2280-2s64p-256g--a39 diff --git a/hosts/taishan200-2280-2s48p-256g--a63 b/hosts/taishan200-2280-2s48p-256g--a63 index a8e6688..0b3c938 100644 --- a/hosts/taishan200-2280-2s48p-256g--a63 +++ b/hosts/taishan200-2280-2s48p-256g--a63 @@ -1,6 +1,3 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 memory: 256G nr_hdd_partitions: 4 hdd_partitions: @@ -17,5 +14,8 @@ mac_addr: - 44:67:47:c9:e5:49 - 44:67:47:c9:e5:4a - 44:67:47:c9:e5:4b +arch: aarch64 +nr_node: 4 +nr_cpu: 96 model_name: Kunpeng-920 ipmi_ip: 9.3.4.4 diff --git a/hosts/taishan200-2280-2s48p-256g--a64 b/hosts/taishan200-2280-2s48p-256g--a64 index f8aa111..7cd0c48 100644 --- a/hosts/taishan200-2280-2s48p-256g--a64 +++ b/hosts/taishan200-2280-2s48p-256g--a64 @@ -1,6 +1,3 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 memory: 256G nr_hdd_partitions: 4 hdd_partitions: @@ -17,5 +14,8 @@ mac_addr: - 44:67:47:c9:ea:b7 - 44:67:47:c9:ea:b8 - 44:67:47:c9:ea:b9 +arch: aarch64 +nr_node: 4 +nr_cpu: 96 model_name: Kunpeng-920 ipmi_ip: 9.3.4.5 diff --git a/hosts/taishan200-2280-2s48p-256g--a65 b/hosts/taishan200-2280-2s48p-256g--a65 index 341303c..88441cc 100644 --- a/hosts/taishan200-2280-2s48p-256g--a65 +++ b/hosts/taishan200-2280-2s48p-256g--a65 @@ -1,6 +1,3 @@ -arch: aarch64 -nr_node: 4 -nr_cpu: 96 memory: 256G nr_hdd_partitions: 4 hdd_partitions: @@ -17,5 +14,8 @@ mac_addr: - 44:67:47:c9:e9:95 - 44:67:47:c9:e9:96 - 44:67:47:c9:e9:97 +arch: aarch64 +nr_node: 4 +nr_cpu: 96 model_name: Kunpeng-920 ipmi_ip: 9.3.4.6 diff --git a/hosts/taishan200-2280-2s64p-256g--a110 b/hosts/taishan200-2280-2s64p-256g--a110 new file mode 100644 index 0000000..50625bc --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a110 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b6079 + - /dev/disk/by-id/scsi-350000399886b69bd +mac_addr: + - 44:67:47:e9:79:3d + - 44:67:47:e9:79:3e + - 44:67:47:e9:79:3f + - 44:67:47:e9:79:40 + - 44:a1:91:9f:9b:8a + - 44:a1:91:9f:9b:8b + - 44:a1:91:9f:9b:8c + - 44:a1:91:9f:9b:8d +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.3 diff --git a/hosts/taishan200-2280-2s64p-256g--a112 b/hosts/taishan200-2280-2s64p-256g--a112 new file mode 100644 index 0000000..30c0f80 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a112 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399888173c1 + - /dev/disk/by-id/scsi-350000399888169c9 +mac_addr: + - 44:a1:91:9d:f3:3a + - 44:a1:91:9d:f3:3b + - 44:a1:91:9d:f3:3c + - 44:a1:91:9d:f3:3d + - 44:a1:91:e5:85:11 + - 44:a1:91:e5:85:12 + - 44:a1:91:e5:85:13 + - 44:a1:91:e5:85:14 +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.5 diff --git a/hosts/taishan200-2280-2s64p-256g--a113 b/hosts/taishan200-2280-2s64p-256g--a113 new file mode 100644 index 0000000..826b18d --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a113 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-35000039988700409 + - /dev/disk/by-id/scsi-350000399886bfb25 +mac_addr: + - 44:67:47:85:ed:b7 + - 44:67:47:85:ed:b8 + - 44:67:47:85:ed:b9 + - 44:67:47:85:ed:ba + - cc:05:77:ee:b3:1f + - cc:05:77:ee:b3:20 + - cc:05:77:ee:b3:21 + - cc:05:77:ee:b3:22 +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.6 diff --git a/hosts/taishan200-2280-2s64p-256g--a114 b/hosts/taishan200-2280-2s64p-256g--a114 new file mode 100644 index 0000000..f3a4d68 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a114 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399785bf105 + - /dev/disk/by-id/scsi-350000399785bf189 +mac_addr: + - 44:a1:91:9d:d5:44 + - 44:a1:91:9d:d5:45 + - 44:a1:91:9d:d5:46 + - 44:a1:91:9d:d5:47 + - 44:a1:91:e5:6f:01 + - 44:a1:91:e5:6f:02 + - 44:a1:91:e5:6f:03 + - 44:a1:91:e5:6f:04 +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.7 diff --git a/hosts/taishan200-2280-2s64p-256g--a116 b/hosts/taishan200-2280-2s64p-256g--a116 new file mode 100644 index 0000000..5ca6cd4 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a116 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b6fad + - /dev/disk/by-id/scsi-350000399886b6ba9 +mac_addr: + - 44:67:47:85:f0:af + - 44:67:47:85:f0:b0 + - 44:67:47:85:f0:b1 + - 44:67:47:85:f0:b2 + - cc:05:77:ee:b0:ef + - cc:05:77:ee:b0:f0 + - cc:05:77:ee:b0:f1 + - cc:05:77:ee:b0:f2 +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.9 diff --git a/hosts/taishan200-2280-2s64p-256g--a118 b/hosts/taishan200-2280-2s64p-256g--a118 new file mode 100644 index 0000000..9a93e03 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a118 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-35000039988707e91 + - /dev/disk/by-id/scsi-350000399887080e5 +mac_addr: + - 44:67:47:e9:78:cf + - 44:67:47:e9:78:d0 + - 44:67:47:e9:78:d1 + - 44:67:47:e9:78:d2 + - 44:a1:91:9f:dd:aa + - 44:a1:91:9f:dd:ab + - 44:a1:91:9f:dd:ac + - 44:a1:91:9f:dd:ad +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.11 diff --git a/hosts/taishan200-2280-2s64p-256g--a119 b/hosts/taishan200-2280-2s64p-256g--a119 new file mode 100644 index 0000000..57da863 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a119 @@ -0,0 +1,19 @@ +memory: 128G +nr_hdd_partitions: 2 +hdd_partitions: + - /dev/disk/by-id/scsi-350000399886b6be9 + - /dev/disk/by-id/scsi-350000399886b5dbd +mac_addr: + - 44:67:47:e9:79:65 + - 44:67:47:e9:79:66 + - 44:67:47:e9:79:67 + - 44:67:47:e9:79:68 + - 44:a1:91:9f:9b:4a + - 44:a1:91:9f:9b:4b + - 44:a1:91:9f:9b:4c + - 44:a1:91:9f:9b:4d +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.11.12 diff --git a/hosts/taishan200-2280-2s64p-256g--a124 b/hosts/taishan200-2280-2s64p-256g--a124 new file mode 100644 index 0000000..7e7bb42 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a124 @@ -0,0 +1,22 @@ +memory: 256G +nr_ssd_partitions: 1 +ssd_partitions: + - /dev/disk/by-id/ata-SAMSUNG_MZ7LH480HAHQ-00005_S45PNA2MB44344 +mac_addr: + - 44:67:47:e9:76:9f + - 44:67:47:e9:76:a0 + - 44:67:47:e9:76:a1 + - 44:67:47:e9:76:a2 + - ac:b3:b5:1e:d5:3b + - ac:b3:b5:1e:d5:3c + - ac:b3:b5:1e:d5:3d + - ac:b3:b5:1e:d5:3e + - ac:b3:b5:1e:d6:6b + - ac:b3:b5:1e:d6:6c + - ac:b3:b5:1e:d6:6d + - ac:b3:b5:1e:d6:6e +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.12.5 diff --git a/hosts/taishan200-2280-2s64p-256g--a39 b/hosts/taishan200-2280-2s64p-256g--a39 new file mode 100644 index 0000000..97d99d9 --- /dev/null +++ b/hosts/taishan200-2280-2s64p-256g--a39 @@ -0,0 +1,27 @@ +memory: 256G +nr_hdd_partitions: 1 +nr_ssd_partitions: 1 +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: + - 84:46:fe:89:b9:98 + - 84:46:fe:89:b9:99 + - 84:46:fe:89:b9:9a + - 84:46:fe:89:b9:9b + - ac:b3:b5:1e:db:2b + - ac:b3:b5:1e:db:2c + - ac:b3:b5:1e:db:2d + - ac:b3:b5:1e:db:2e + - ac:b3:b5:1e:d8:3b + - ac:b3:b5:1e:d8:3c + - ac:b3:b5:1e:d8:3d + - ac:b3:b5:1e:d8:3e +arch: aarch64 +nr_node: 4 +nr_cpu: 128 +model_name: Kunpeng-920 +ipmi_ip: 9.3.2.4 -- 2.23.0

1 0

[PATCH compass-ci] lib/job.cr: change upload dir
by Wang Yong 26 Mar '21

26 Mar '21

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- src/lib/job.cr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index c1ca223..5767f61 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -293,7 +293,7 @@ class Job elsif @hash["cci-depends"]? package_dir = ",/initrd/deps/#{common_dir}/#{@hash["cci-depends"]["benchmark"]}" elsif @hash["rpmbuild-pkg"]? - package_dir = ",/initrd/rpmbuild-pkg/#{common_dir}" + package_dir = ",/rpm/upload/#{common_dir}" elsif @hash["build-pkg"]? if @hash["pkgbuild_repo"].to_s =~ /(packages|community)\/\// package_name = @hash["pkgbuild_repo"].to_s.split("/")[-2] -- 2.23.0

1 0

[PATCH lkp-tests] tests/rpmbuild-pkg: change upload dir
by Wang Yong 26 Mar '21

26 Mar '21

Signed-off-by: Wang Yong <wangyong0117(a)qq.com> --- tests/rpmbuild-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rpmbuild-pkg b/tests/rpmbuild-pkg index 90905b220..7a101b6a0 100755 --- a/tests/rpmbuild-pkg +++ b/tests/rpmbuild-pkg @@ -11,7 +11,7 @@ [ -n "$upstream_repo" ] || die "upstream_repo is empty" -dest_dir="/initrd/rpmbuild-pkg/${os}-${os_version}/${compat_os}" +dest_dir="/rpm/upload/${os}-${os_version}/${compat_os}" from_git() { -- 2.23.0

1 0

[PATCH compass-ci] doc: fix some spell errors
by Li Yuanchao 26 Mar '21

26 Mar '21

blacklight => backlight Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- doc/manual/test-oss-project.en.md | 2 +- doc/manual/test-oss-project.zh.md | 4 ++-- .../{fork_blacklight.png => fork_backlight.png} | Bin 3 files changed, 3 insertions(+), 3 deletions(-) rename doc/pictures/{fork_blacklight.png => fork_backlight.png} (100%) diff --git a/doc/manual/test-oss-project.en.md b/doc/manual/test-oss-project.en.md index a3c0781..6b6d9ca 100644 --- a/doc/manual/test-oss-project.en.md +++ b/doc/manual/test-oss-project.en.md @@ -8,7 +8,7 @@ Perform the following steps to add the information of the code repository to be 1. Fork the upstream-repos repository and clone it to the local host. This document uses the **backlight** repository (https://github.com/baskerville/backlight) as an example. -![](./../pictures/fork_blacklight.png) +![](./../pictures/fork_backlight.png) 2. Run the following command to create a file path named with the repository name and its initial letter: diff --git a/doc/manual/test-oss-project.zh.md b/doc/manual/test-oss-project.zh.md index b455c32..413066d 100644 --- a/doc/manual/test-oss-project.zh.md +++ b/doc/manual/test-oss-project.zh.md @@ -6,9 +6,9 @@ 执行以下步骤，将想要测试的代码仓信息以 yaml 文件的方式添加到 upstream-repos 仓库（https://gitee.com/wu_fengguang/upstream-repos ）。 -1. Fork upstream-repos 仓库并 git clone 到本地，本文以 blacklight 仓库（https://github.com/baskerville/backlight ）为例说明。 +1. Fork upstream-repos 仓库并 git clone 到本地，本文以 backlight 仓库（https://github.com/baskerville/backlight ）为例说明。 -![](./../pictures/fork_blacklight.png) +![](./../pictures/fork_backlight.png) 2. 执行以下命令，以首字母和仓库名创建文件路径。 diff --git a/doc/pictures/fork_blacklight.png b/doc/pictures/fork_backlight.png similarity index 100% rename from doc/pictures/fork_blacklight.png rename to doc/pictures/fork_backlight.png -- 2.23.0

1 0

[PATCH lkp-tests] lib/email.sh: rename $MAIL_HOST
by Liu Yinsi 25 Mar '21

25 Mar '21

MAIL_HOST => SEND_MAIL_HOST [why] because MAIL_HOST is duplicate variable name, $MAIL_HOST is $SEND_MAIL_HOST. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- lib/email.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/email.sh b/lib/email.sh index bca4ab435..4f1055033 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -87,5 +87,5 @@ send_email() ${subject}_content - curl -XPOST "${MAIL_HOST:-$LKP_SERVER}:${MAIL_PORT:-10001}/send_mail_text" -d "$email_content" + curl -XPOST "${SEND_MAIL_HOST:-$LKP_SERVER}:${SEND_MAIL_PORT:-10001}/send_mail_text" -d "$email_content" } -- 2.23.0

1 0