- Compass-ci - mailweb.openeuler.org

[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

[PATCH v3 compass-ci] sparrow/3-code/dev-env: set vars defaults values
by Liu Yinsi 25 Mar '21

25 Mar '21

[why] add vars and defaults values is easy to management. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index f16cf80..d61f11e 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -34,6 +34,21 @@ server_name=$(hostname | cut -f1 -d.) : ${DOCKER_REGISTRY_PORT:=5001} : ${LOCAL_SEND_MAIL_PORT:=11311} : ${LOCAL_ROBOT_EMAIL_ADDRESS:=Crystal TEAM} +: ${GIT_SERVER:=$server_ip} +: ${SCHED_HTTPS_HOST:=$server_ip} +: ${SCHED_HTTPS_PORT:=20002} +: ${DOCKER_PROXY_HOST:=$server_ip} +: ${DOCKER_PROXY_PORT:=3128} +: ${JUMPER_HOST:=$server_ip} +: ${JUMPER_PORT:=10000} +: ${MONITOR_HOST:=$server_ip} +: ${FETCH_MAIL_DIR:=/srv/cci/Maildir} +: ${FETCH_MAIL_BOX:=.compass-ci} +: ${GIT_DAEMON_HOST:=$server_ip} +: ${GIT_MIRROR_HOST:=$server_ip} +: ${REDIS_PORT:=6379} +: ${MAILDIR:=/srv/cci/Maildir/.compass-ci} +: ${SENT_MAILDIR:=/srv/cci/Maildir/.sent} mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF @@ -53,6 +68,8 @@ EOF mkdir -p /etc/compass-ci/service cat > /etc/compass-ci/service/service-env.yaml <<EOF +SCHED_HTTPS_HOST: $SCHED_HTTPS_HOST +SCHED_HTTPS_PORT: $SCHED_HTTPS_PORT ES_HOST: $ES_HOST ES_PORT: $ES_PORT SCHED_HOST: $sched_host @@ -88,6 +105,18 @@ DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT LOCAL_SEND_MAIL_PORT: $LOCAL_SEND_MAIL_PORT MAILDIR: /srv/cci/Maildir/.compass-ci LOCAL_ROBOT_EMAIL_ADDRESS: $LOCAL_ROBOT_EMAIL_ADDRESS +DOCKER_PROXY_HOST: $DOCKER_PROXY_HOST +DOCKER_PROXY_PORT: $DOCKER_PROXY_PORT +JUMPER_HOST: $JUMPER_HOST +JUMPER_PORT: $JUMPER_PORT +MONITOR_HOST: $MONITOR_HOST +FETCH_MAIL_DIR: $FETCH_MAIL_DIR +FETCH_MAIL_BOX: $FETCH_MAIL_BOX +GIT_DAEMON_HOST: $GIT_DAEMON_HOST +GIT_MIRROR_HOST: $GIT_MIRROR_HOST +REDIS_PORT: $REDIS_PORT +MAILDIR: $MAILDIR +SENT_MAILDIR: $SENT_MAILDIR EOF mkdir -p /etc/compass-ci/scheduler -- 2.23.0

2 2

[PATCH v4 compass-ci] sparrow/3-code/dev-env: set vars defaults values
by Liu Yinsi 25 Mar '21

25 Mar '21

[why] add vars and defaults values is easy to management. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index f16cf80..f96972e 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -34,6 +34,22 @@ server_name=$(hostname | cut -f1 -d.) : ${DOCKER_REGISTRY_PORT:=5001} : ${LOCAL_SEND_MAIL_PORT:=11311} : ${LOCAL_ROBOT_EMAIL_ADDRESS:=Crystal TEAM} +: ${GIT_SERVER:=$server_ip} +: ${SCHED_HTTPS_HOST:=$server_ip} +: ${SCHED_HTTPS_PORT:=20002} +: ${DOCKER_PROXY_HOST:=$server_ip} +: ${DOCKER_PROXY_PORT:=3128} +: ${JUMPER_HOST:=$server_ip} +: ${JUMPER_PORT:=10000} +: ${MONITOR_HOST:=$server_ip} +: ${MONITOR_PORT:=20001} +: ${FETCH_MAIL_DIR:=/srv/cci/Maildir} +: ${FETCH_MAIL_BOX:=.compass-ci} +: ${GIT_DAEMON_HOST:=$server_ip} +: ${GIT_MIRROR_HOST:=$server_ip} +: ${REDIS_PORT:=6379} +: ${MAILDIR:=/srv/cci/Maildir/.compass-ci} +: ${SENT_MAILDIR:=/srv/cci/Maildir/.sent} mkdir -p /etc/compass-ci/defaults cat > /etc/compass-ci/defaults/$server_name.yaml <<EOF @@ -53,6 +69,8 @@ EOF mkdir -p /etc/compass-ci/service cat > /etc/compass-ci/service/service-env.yaml <<EOF +SCHED_HTTPS_HOST: $SCHED_HTTPS_HOST +SCHED_HTTPS_PORT: $SCHED_HTTPS_PORT ES_HOST: $ES_HOST ES_PORT: $ES_PORT SCHED_HOST: $sched_host @@ -88,6 +106,19 @@ DOCKER_REGISTRY_PORT: $DOCKER_REGISTRY_PORT LOCAL_SEND_MAIL_PORT: $LOCAL_SEND_MAIL_PORT MAILDIR: /srv/cci/Maildir/.compass-ci LOCAL_ROBOT_EMAIL_ADDRESS: $LOCAL_ROBOT_EMAIL_ADDRESS +DOCKER_PROXY_HOST: $DOCKER_PROXY_HOST +DOCKER_PROXY_PORT: $DOCKER_PROXY_PORT +JUMPER_HOST: $JUMPER_HOST +JUMPER_PORT: $JUMPER_PORT +MONITOR_HOST: $MONITOR_HOST +MONITOR_PORT: $MONITOR_PORT +FETCH_MAIL_DIR: $FETCH_MAIL_DIR +FETCH_MAIL_BOX: $FETCH_MAIL_BOX +GIT_DAEMON_HOST: $GIT_DAEMON_HOST +GIT_MIRROR_HOST: $GIT_MIRROR_HOST +REDIS_PORT: $REDIS_PORT +MAILDIR: $MAILDIR +SENT_MAILDIR: $SENT_MAILDIR EOF mkdir -p /etc/compass-ci/scheduler -- 2.23.0

1 0

[PATCH lkp-tests] lib/monitor.rb: update SRV_HTTP_RESULT_PORT
by Liu Yinsi 25 Mar '21

25 Mar '21

Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- lib/email.sh | 2 +- lib/monitor.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/email.sh b/lib/email.sh index 63d5a51e2..bca4ab435 100755 --- a/lib/email.sh +++ b/lib/email.sh @@ -8,7 +8,7 @@ Subject: [NOTIFY Compass-CI] Test job failed: $id Dear $my_name: Sorry to inform you that your test job is failed, you can click the following link to view details. - http://api.compass-ci.openeuler.org:${SRV_HTTP_PORT:-11300}$result_root + http://api.compass-ci.openeuler.org:${SRV_HTTP_RESULT_PORT:-20007}$result_r… Regards Compass-CI diff --git a/lib/monitor.rb b/lib/monitor.rb index f14e131e3..bf7ef69ba 100755 --- a/lib/monitor.rb +++ b/lib/monitor.rb @@ -100,9 +100,9 @@ class Monitor @result_roots.each do |res| res.to_s.delete_prefix!('/srv') - srv_http_host = job['SRV_HTTP_HOST'] || 'api.compass-ci.openeuler.org' - srv_http_port = job['SRV_HTTP_PORT'] || '11300' - url = "http://#{srv_http_host}:#{srv_http_port}#{res}" + srv_http_result_host = job['SRV_HTTP_RESULT_HOST'] || 'api.compass-ci.openeuler.org' + srv_http_result_port = job['SRV_HTTP_RESULT_PORT'] || '20007' + url = "http://#{srv_http_result_host}:#{srv_http_result_port}#{res}" system "lftp -c mirror #{url} >/dev/null 2>&1" end end -- 2.23.0

1 0

help star
by Wu Fengguang 25 Mar '21

25 Mar '21

Yu Chuan, Wu Zhende is our help star again, thanks Yu Chuan, Wu Zhende! wfg@crystal ~/todo/bin% ./help-star ../people/*/credit/2021-03-25.md 15.2 Yu Chuan 15.1 Wu Zhende 11.2 Cao Xueliang 11.0 Wei Jihui 8.8 Liu Yinsi 7.4 Luan Shengde 7.0 Wang Yong 6.4 Lu Weitao 5.6 Wu Fengguang 5.4 Wang Chenglong 5.1 Zhang Dewan 5.0 Li Yuanchao 4.2 Liu Shaofei 4.1 Lin Jiaxin 2.9 Li Ping 1.8 Du Kaitian 1.6 Xu Xijian 1.2 Bai Jing 0.9 Cui Yili 0.0 Zhang Yale

1 0