October 2020 - Compass-ci - mailweb.openeuler.org

[PATCH v2 compass-ci] container: add a container auto-submit
by Li Yuanchao 09 Oct '20

09 Oct '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- container/auto-submit/Dockerfile | 16 +++++++++++++++ container/auto-submit/build | 6 ++++++ container/auto-submit/start | 30 +++++++++++++++++++++++++++++ container/auto-submit/start-depends | 1 + 4 files changed, 53 insertions(+) create mode 100644 container/auto-submit/Dockerfile create mode 100755 container/auto-submit/build create mode 100755 container/auto-submit/start create mode 100755 container/auto-submit/start-depends diff --git a/container/auto-submit/Dockerfile b/container/auto-submit/Dockerfile new file mode 100644 index 0000000..5b44551 --- /dev/null +++ b/container/auto-submit/Dockerfile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM alpine:3.11 + +RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories + +RUN apk update && \ + apk upgrade && \ + apk add --no-cache git && \ + apk add ruby-dev make gcc g++ + +RUN echo ':sources: ["http://rubygems.org"]' >> ~/.gemrc + +RUN umask 002 && \ + gem install bunny json activesupport git rest-client diff --git a/container/auto-submit/build b/container/auto-submit/build new file mode 100755 index 0000000..96383e3 --- /dev/null +++ b/container/auto-submit/build @@ -0,0 +1,6 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t alpine:auto-submit . + diff --git a/container/auto-submit/start b/container/auto-submit/start new file mode 100755 index 0000000..4632ab0 --- /dev/null +++ b/container/auto-submit/start @@ -0,0 +1,30 @@ +#!/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_relative '../defconfig.rb' + +DOCKER_CCI = '/c/compass-ci' +DOCKER_LKP = '/c/lkp-tests' +docker_rm "auto-submit" + +cmd = %W[ + docker run + --restart=always + --name auto-submit + -u 1090:1090 + -d + -e CCI_SRC=#{DOCKER_CCI} + -e LKP_SRC=#{DOCKER_LKP} + -v #{ENV['CCI_SRC']}:#{DOCKER_CCI} + -v #{ENV['LKP_SRC']}:#{DOCKER_LKP} + -v /etc/localtime:/etc/localtime:ro + -v /etc/compass-ci/defaults:/etc/compass-ci/defaults:ro + -v /srv/git:/srv/git + -w /c/compass-ci/sbin + alpine:auto-submit +] + +cmd += ['sh', '-c', 'umask 002 && ./auto_submit'] +system(*cmd) diff --git a/container/auto-submit/start-depends b/container/auto-submit/start-depends new file mode 100755 index 0000000..5232abf --- /dev/null +++ b/container/auto-submit/start-depends @@ -0,0 +1 @@ +rabbitmq -- 2.23.0

1 0

[PATCH compass-ci] README.md: improve format for README.md
by Lu Kaiyi 09 Oct '20

09 Oct '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- README.md | 66 +++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index cd02803..644e9ba 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### 概念 -Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github,Gitee,Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过Compass-CI，社区开发者可以将开源软件快速引入openEuler社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 +Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上游开源软件（来自 Github, Gitee, Gitlab 等托管平台）的测试服务、登录服务、故障辅助定界服务和基于历史数据的分析服务。通过 Compass-CI，社区开发者可以将开源软件快速引入 openEuler 社区，并补充更多的测试用例，共同构建一个开放、完整的开源软件生态系统。 ### 功能描述 @@ -31,11 +31,11 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 ![Compass-CI架构](doc/pictures/compass-ci-architecture.png) - **接入层** - 成为衔接Compass-CI 服务于开发者的纽带，同时提供内部设备管理的平台，提供web门户查阅测试结果、项目清单、ssh环境登录 + 成为衔接 Compass-CI 服务于开发者的纽带，同时提供内部设备管理的平台，提供 web 门户查阅测试结果、项目清单、ssh 环境登录。 - **服务层** - 提供测试服务、环境登录、结果分析、辅助定界、用户项目注册能力，为本项目的主要功能 + 提供测试服务、环境登录、结果分析、辅助定界、用户项目注册能力，为本项目的主要功能。 - **支撑层** @@ -43,7 +43,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - **数据层** - 为项目提供数据处理服务，包括测试结果格式化及归档 + 为项目提供数据处理服务，包括测试结果格式化及归档。 - **资源层** @@ -54,7 +54,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - **聚合开发者测试用例** - 开发者向代码托管平台提交代码、测试用例、测试工具时，Compass-CI自动获取提交的代码开展构建测试，同时获取开发者编写到开源软件包的测试用例进行自动化测试，并反馈测试结果。 + 开发者向代码托管平台提交代码、测试用例、测试工具时，Compass-CI 自动获取提交的代码开展构建测试，同时获取开发者编写到开源软件包的测试用例进行自动化测试，并反馈测试结果。 - **登录环境随时调测** @@ -66,16 +66,16 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - **辅助定界** - 测试过程中，发现有 Bug 时，自动触发 Regression 机制，找出首次引入问题 Commit 信息。 + 测试过程中，发现有 Bug 时，自动触发 Regression 机制，找出首次引入问题的 Commit 信息。 -## 使用Compass-CI -> 您只需要先注册自己的仓库，当您的仓库有commit提交时，构建测试会自动执行，并且可在我们的网站中查看结果。 +## 使用 Compass-CI +> 您只需要先注册自己的仓库，当您的仓库有 commit 提交时，构建测试会自动执行，并且可在我们的网站中查看结果。 - 注册自己的仓库 - 如果您想在 `git push` 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库[upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 + 如果您想在 `git push` 的时候, 自动触发测试, 那么需要把您的公开 git url 添加到如下仓库 [upstream-repos](https://gitee.com/wu_fengguang/upstream-repos)。 ```bash git clone https://gitee.com/wu_fengguang/upstream-repos.git less upstream-repos/README.md @@ -83,7 +83,7 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - `git push` - 更新仓库，自动触发测试 + 更新仓库，自动触发测试。 - 在网页中搜索并查看结果 @@ -93,62 +93,62 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 ## 高级功能 -### 添加OS支持 +### 添加 OS 支持 -制作一个initramfs启动的cgz镜像，当系统内核启动时，直接从打包的cgz镜像中导出rootfs，在内存中展开文件系统，利用磁盘的高速缓存机制让系统直接在内存中读写文件，以提升系统的I/O性能。 +制作一个 initramfs 启动的 cgz 镜像，当系统内核启动时，直接从打包的 cgz 镜像中导出 rootfs，在内存中展开文件系统，利用磁盘的高速缓存机制让系统直接在内存中读写文件，以提升系统的 I/O 性能。 #### 操作步骤 - 1. 获取对应os版本的rootfs（以openEuler为例） - - 通过docker获取rootfs + 1. 获取对应 os 版本的 rootfs（以 openEuler 为例） + - 通过 docker 获取 rootfs - 1) 下载openEuler官方提供的docker镜像压缩包 + 1) 下载 openEuler 官方提供的 docker 镜像压缩包 ```bash wget https://repo.openeuler.org/openEuler-20.03-LTS/docker_img/aarch64/openEuler… ``` - 2) 加载docker镜像 + 2) 加载 docker 镜像 ```bash docker load -i openEuler-docker.aarch64 ``` - 3) 启动openEuler容器 + 3) 启动 openEuler 容器 ```bash docker run -id openeuler-20.03-lts ``` - 4) 拷贝docker的rootfs + 4) 拷贝 docker 的 rootfs ```bash docker cp -a docker run -d openeuler-20.03-lts:/ openEuler-rootfs ``` - - 通过qemu.img(qcow2格式)获取rootfs (以openEuler为例) + - 通过 qemu.img(qcow2格式)获取 rootfs (以 openEuler 为例) - 1) 下载openEuler官方网站提供的qcow2格式镜像 + 1) 下载 openEuler 官方网站提供的 qcow2 格式镜像 ```bash wget https://repo.openeuler.org/openEuler-20.03-LTS/virtual_machine_img/aarch64/… ``` - 2) 使用{compass-ci}/container/qcow2rootfs 制作rootfs + 2) 使用 {compass-ci}/container/qcow2rootfs 制作 rootfs ```bash cd {compass-ci}/container/qcow2rootfs ./run openEuler-20.03-LTS.aarch64.qcow2.xz /tmp/openEuler-rootfs ``` - 2. 定制rootfs - 1. 使用chroot命令切换到rootfs中(此步骤需要root权限) + 2. 定制 rootfs + 1. 使用 chroot 命令切换到 rootfs 中(此步骤需要 root 权限) ```bash chroot openEuler-rootfs ``` 2. 根据个人需要安装并配置服务 - a. 修改root密码 - b. 配置ssh服务 + a. 修改 root 密码 + b. 配置 ssh 服务 c. 检查系统时间 - d. 如果使用docker制作osimage还需要以下操作： + d. 如果使用 docker 制作 osimage 还需要以下操作： > 1. 安装所需版本内核 - > 2. 从centos官方网站下载内核rpm包 - > 3. 使用yum进行安装 - > 4. 删除docker环境变量文件 + > 2. 从 centos 官方网站下载内核 rpm 包 + > 3. 使用 yum 进行安装 + > 4. 删除 docker 环境变量文件 - 3. 退出rootfs，并打包 + 3. 退出 rootfs，并打包 ```bash cd $rootfs find . | coip -o -Hnewc |gzip -9 > $os_name.cgz @@ -167,16 +167,16 @@ Compass-CI 是一个可持续集成的软件平台。为开发者提供针对上 - 解决方法 1）启动内存不足，增加内存可解决。 - 2）内核文件权限不足，给予644权限。 + 2）内核文件权限不足，给予 644 权限。 2. 系统运行缓慢 - 问题现象 - 打包镜像体积过大，会消耗很大内存 + 打包镜像体积过大，会消耗很大内存。 - 解决方法 - 建议用户根据具体需要对rootfs进行裁剪。 + 建议用户根据具体需要对 rootfs 进行裁剪。 ## 呼吁合作 -- 2.23.0

1 0

[PATCH compass-ci] container: add a container auto-submit
by Li Yuanchao 09 Oct '20

09 Oct '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- container/auto-submit/Dockerfile | 15 +++++++++++++++ container/auto-submit/build | 6 ++++++ container/auto-submit/start | 30 +++++++++++++++++++++++++++++ container/auto-submit/start-depends | 1 + 4 files changed, 52 insertions(+) create mode 100644 container/auto-submit/Dockerfile create mode 100755 container/auto-submit/build create mode 100755 container/auto-submit/start create mode 100755 container/auto-submit/start-depends diff --git a/container/auto-submit/Dockerfile b/container/auto-submit/Dockerfile new file mode 100644 index 0000000..16b3593 --- /dev/null +++ b/container/auto-submit/Dockerfile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM alpine:3.11 + +RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories + +RUN apk update && \ + echo ':sources: ["http://rubygems.org"]' >> ~/.gemrc && \ + apk upgrade && \ + apk add --no-cache git && \ + apk add ruby-dev make gcc g++ + +RUN umask 002 && \ + gem install bunny json activesupport git rest-client diff --git a/container/auto-submit/build b/container/auto-submit/build new file mode 100755 index 0000000..3ae6b78 --- /dev/null +++ b/container/auto-submit/build @@ -0,0 +1,6 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t alpine311:auto-submit . + diff --git a/container/auto-submit/start b/container/auto-submit/start new file mode 100755 index 0000000..d0a0978 --- /dev/null +++ b/container/auto-submit/start @@ -0,0 +1,30 @@ +#!/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_relative '../defconfig.rb' + +DOCKER_CCI = '/c/compass-ci' +DOCKER_LKP = '/c/lkp-tests' +docker_rm "auto-submit" + +cmd = %W[ + docker run + --restart=always + --name auto-submit + -u 1090:1090 + -d + -e CCI_SRC=#{DOCKER_CCI} + -e LKP_SRC=#{DOCKER_LKP} + -v #{ENV['CCI_SRC']}:#{DOCKER_CCI} + -v #{ENV['LKP_SRC']}:#{DOCKER_LKP} + -v /etc/localtime:/etc/localtime:ro + -v /etc/compass-ci/defaults:/etc/compass-ci/defaults:ro + -v /srv/git:/srv/git + -w /c/compass-ci/sbin + alpine311:auto-submit +] + +cmd += ['sh', '-c', 'umask 002 && ./auto_submit'] +system(*cmd) diff --git a/container/auto-submit/start-depends b/container/auto-submit/start-depends new file mode 100755 index 0000000..5232abf --- /dev/null +++ b/container/auto-submit/start-depends @@ -0,0 +1 @@ +rabbitmq -- 2.23.0

3 5

[PATCH v4 compass-ci 2/2] sparrow: open the masquerade at public zone
by Hu Xuejiao 09 Oct '20

09 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- sparrow/2-network/iptables | 1 + 1 file changed, 1 insertion(+) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 7183145..0fd82e5 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -28,3 +28,4 @@ DOCKER0_SUBNET=172.17.0.0/16 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-masquerade -- 2.23.0

3 2

[PATCH v4 compass-ci 1/2] fix(sparrow): process will exit if firewalld.service was not installed
by Hu Xuejiao 09 Oct '20

09 Oct '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 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sparrow/2-network/iptables b/sparrow/2-network/iptables index 092c4ca..7183145 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -12,15 +12,19 @@ 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 +} - DOCKER0_IFACE=docker0 - DOCKER0_SUBNET=172.17.0.0/16 +systemctl start firewalld +[ "$(systemctl is-active firewalld)" == "active" ] || { + echo "start firewalld.service failed" + exit 0 +} - 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 +DOCKER0_SUBNET=172.17.0.0/16 - 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

2 1

[PATCH v2 compass-ci] container: manjaro: fix dependency issues
by Liu Yinsi 09 Oct '20

09 Oct '20

pacman -Sy cause dependency issues, must use pacman -Syu. 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) 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 compass-ci] providers/docker: change commpass-ci => compass-ci
by Cao Xueliang 09 Oct '20

09 Oct '20

Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- providers/docker/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/docker/run.sh b/providers/docker/run.sh index c37dd20..6798f48 100755 --- a/providers/docker/run.sh +++ b/providers/docker/run.sh @@ -23,10 +23,10 @@ cmd=( --rm -m $memory --mount type=tmpfs,destination=/tmp - -e CCI_SRC=/c/commpass-ci + -e CCI_SRC=/c/compass-ci -v ${load_path}/lkp:/lkp -v ${DIR}/bin:/root/bin:ro - -v $CCI_SRC:/c/commpass-ci + -v $CCI_SRC:/c/compass-ci -v /srv/git:/srv/git:ro --oom-score-adj="-1000" ${docker_image} -- 2.23.0

1 0

[PATCH compass-ci] src: change vm-hi1620 to vm-aarch64
by Bai Jing 09 Oct '20

09 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- src/delimiter/constants.rb | 2 +- src/features/jobs/right_iperf.yaml | 2 +- src/features/scheduler.feature | 2 +- src/features/step_definitions/scheduler_step.rb | 2 +- src/lib/web_backend.rb | 4 ++-- src/scheduler/README.md | 2 +- src/taskqueue/queue.cr | 2 +- src/taskqueue/redis_client.cr | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index 7a17b36..70196c1 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -9,4 +9,4 @@ MONITOR_PORT = ENV['MONITOR_PORT'] || '11310' TMEP_GIT_BASE = '/c/public_git' DELIMITER_TASK_QUEUE = 'delimiter' BISECT_RUN_SCRIPT = "#{ENV['CCI_SRC']}/src/delimiter/find-commit/bisect_run_script.rb" -DELIMITER_TBOX_GROUP = 'vm-hi1620-2p8g--delimiter' +DELIMITER_TBOX_GROUP = 'vm-aarch64-2p8g--delimiter' diff --git a/src/features/jobs/right_iperf.yaml b/src/features/jobs/right_iperf.yaml index 843564d..60654d9 100644 --- a/src/features/jobs/right_iperf.yaml +++ b/src/features/jobs/right_iperf.yaml @@ -3,7 +3,7 @@ #! jobs/iperf.yaml suite: iperf testcase: iperf -testbox: vm-hi1620-2p8g-chief +testbox: vm-aarch64-2p8g-chief category: benchmark runtime: 30 cluster: cs-localhost diff --git a/src/features/scheduler.feature b/src/features/scheduler.feature index c335fb4..e22ad6a 100644 --- a/src/features/scheduler.feature +++ b/src/features/scheduler.feature @@ -6,7 +6,7 @@ Feature: Scheduler Given prepared a job "right_iperf.yaml" When call with API: post "submit_job" job from add_job.sh Then return with job id - When call with API: put "set_host_mac" "vm-hi1620-2p8g-chief => ef-01-02-03-04-05" + When call with API: put "set_host_mac" "vm-aarch64-2p8g-chief => ef-01-02-03-04-05" And call with API: get "boot.ipxe/mac/ef-01-02-03-04-05" Then return with basic ipxe boot parameter and initrd and kernel diff --git a/src/features/step_definitions/scheduler_step.rb b/src/features/step_definitions/scheduler_step.rb index 882ddd8..cb49837 100644 --- a/src/features/step_definitions/scheduler_step.rb +++ b/src/features/step_definitions/scheduler_step.rb @@ -22,7 +22,7 @@ Then('return with job id') do end # set_host_mac -# host_mac => "vm-hi1620-2p8g-chief => ef-01-02-03-04-05" +# host_mac => "vm-aarch64-2p8g-chief => ef-01-02-03-04-05" Given('call with API: put {string} {string}') do |url, host_mac| host_mac_params = host_mac.split(' ') url_with_params = "#{url}?hostname=#{host_mac_params[0]}\\&mac=#{host_mac_params[2]}" diff --git a/src/lib/web_backend.rb b/src/lib/web_backend.rb index 4544690..7271605 100644 --- a/src/lib/web_backend.rb +++ b/src/lib/web_backend.rb @@ -41,8 +41,8 @@ def es_count(query) ES_CLIENT.count(index: 'jobs*', body: query)['count'] end -# "vm-hi1620-2p8g-212" remove "-212" -# "vm-hi1620-2p8g-zzz" remove "-zzz" +# "vm-aarch64-2p8g-212" remove "-212" +# "vm-aarch64-2p8g-zzz" remove "-zzz" # "vm-git-bisect" don't remove "-bisect" def filter_tbox_group(es_result) result = Set.new diff --git a/src/scheduler/README.md b/src/scheduler/README.md index 5da1bde..66d7e49 100644 --- a/src/scheduler/README.md +++ b/src/scheduler/README.md @@ -413,7 +413,7 @@ you can simply call the scheduler's build and run script. vim $CCI_SRC/user-client/helper/iperf.yaml runtime: 30 # unit in seconds, the time can be shortened arch: aarch64 - testbox: vm-hi1620-2p8g-$USER # echo $USER for your own user name + testbox: vm-aarch64-2p8g-$USER # echo $USER for your own user name ## 2.Submit job submit-job $_CCI_SRC/user-client/helper/iperf.yaml diff --git a/src/taskqueue/queue.cr b/src/taskqueue/queue.cr index 02236f5..565af7d 100644 --- a/src/taskqueue/queue.cr +++ b/src/taskqueue/queue.cr @@ -183,7 +183,7 @@ class TaskQueue private def move_uuid_task2ready(queue_name) # get uuid lists - # uuid_keys ["queues/sched/vm-hi1620-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451", ] + # uuid_keys ["queues/sched/vm-aarch64-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451", ] uuid_keys = get_uuid_keys("#{queue_name}") return unless uuid_keys # nil return unless uuid_keys.size > 0 diff --git a/src/taskqueue/redis_client.cr b/src/taskqueue/redis_client.cr index 3bac924..35ee31e 100644 --- a/src/taskqueue/redis_client.cr +++ b/src/taskqueue/redis_client.cr @@ -236,7 +236,7 @@ class TaskQueue private def get_uuid_keys(queue_name) return nil unless queue_name[0..5] == "sched/" - # search = "queues/sched/vm-hi1620-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451" + # search = "queues/sched/vm-aarch64-2p8g/ee44b164-90e3-49a7-9798-5e7cc9bc7451" # only 3 matchs keyword: * [] ? search = "#{QUEUE_NAME_BASE}/#{queue_name}/[0-9a-eA-F\-]*" lua_script = "return redis.call('keys', KEYS[1])" -- 2.23.0

1 1

[PATCH compass-ci] providers: change the vm-hi1620 to vm-aarch64
by Bai Jing 09 Oct '20

09 Oct '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- providers/multi-qemu | 2 +- providers/my-qemu.sh | 2 +- providers/qemu.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/providers/multi-qemu b/providers/multi-qemu index 72453fb..76e39ee 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -8,7 +8,7 @@ require 'fileutils' PWD = Dir.pwd # Run multiple QEMU in parallel -HOSTNAME = ARGV[0] || "vm-hi1620-2p8g--#{ENV['USER']}" +HOSTNAME = ARGV[0] || "vm-aarch64-2p8g--#{ENV['USER']}" NR_VM = ARGV[1] || 1 def run(seqno) diff --git a/providers/my-qemu.sh b/providers/my-qemu.sh index 2f20f67..f52b2ba 100755 --- a/providers/my-qemu.sh +++ b/providers/my-qemu.sh @@ -3,7 +3,7 @@ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. [[ $tbox_group ]] || -tbox_group=vm-hi1620-2p8g +tbox_group=vm-aarch64-2p8g export hostname=$tbox_group--$USER-$$ $CCI_SRC/providers/qemu.sh diff --git a/providers/qemu.sh b/providers/qemu.sh index 786a7aa..aed8c3d 100755 --- a/providers/qemu.sh +++ b/providers/qemu.sh @@ -8,7 +8,7 @@ load_cci_defaults -: ${hostname:="vm-hi1620-1p1g-1"} +: ${hostname:="vm-aarch64-1p1g-1"} # unicast prefix: x2, x6, xA, xE export mac=$(echo $hostname | md5sum | sed 's/^$..$$..$$..$$..$$..$.*$/0a-\1-\2-\3-\4-\5/') echo hostname: $hostname -- 2.23.0

1 1

[PATCH compass-ci] sparrow: change hi1620 to aarch64
by Zhang Yu 09 Oct '20

09 Oct '20

Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- sbin/auto_submit.yaml | 8 ++++---- sparrow/6-test/qemu | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/auto_submit.yaml b/sbin/auto_submit.yaml index 7076cca..51c7cf1 100644 --- a/sbin/auto_submit.yaml +++ b/sbin/auto_submit.yaml @@ -1,7 +1,7 @@ AvxToNeon/AvxToNeon: -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml +- testbox=vm-aarch64-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 api-avx2neon.yaml compass-ci/compass-ci: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml -- testbox=vm-hi1620-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-aarch64-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml +- testbox=vm-aarch64-2p8g os=centos os_version=7.6 os_mount=initramfs os_arch=aarch64 deploy-cci.yaml archlinux: -- testbox=vm-hi1620-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml +- testbox=vm-aarch64-2p8g os=openeuler os_version=20.03 os_mount=initramfs os_arch=aarch64 build-pkg.yaml diff --git a/sparrow/6-test/qemu b/sparrow/6-test/qemu index 1e92a47..93eeb886 100755 --- a/sparrow/6-test/qemu +++ b/sparrow/6-test/qemu @@ -12,5 +12,5 @@ run_job() } dmidecode -s system-product-name | grep -iq "virtual" && exit -run_job vm-hi1620-2p8g -run_job vm-pxe-hi1620-2p8g +run_job vm-aarch64-2p8g +run_job vm-pxe-aarch64-2p8g -- 2.23.0

1 0

2024

2023

2022

2021

2020

Compass-ci October 2020