- Compass-ci - mailweb.openeuler.org

[PATCH lab-z9] hosts: delete duplicate arches
by Hu Xuejiao 29 Oct '20

29 Oct '20

Signed-off-by: Hu XueJiao <huxuejiao1(a)huawei.com> --- hosts/vm-hi1620-1p1g | 1 - hosts/vm-hi1620-2p1g | 1 - hosts/vm-hi1620-2p4g | 1 - hosts/vm-hi1620-2p8g | 1 - 4 files changed, 4 deletions(-) diff --git a/hosts/vm-hi1620-1p1g b/hosts/vm-hi1620-1p1g index 2226bdc..bf2a7b3 100644 --- a/hosts/vm-hi1620-1p1g +++ b/hosts/vm-hi1620-1p1g @@ -1,4 +1,3 @@ -arch: aarch64 provider: qemu template: kvm nr_cpu: 1 diff --git a/hosts/vm-hi1620-2p1g b/hosts/vm-hi1620-2p1g index e2952eb..1c4786a 100644 --- a/hosts/vm-hi1620-2p1g +++ b/hosts/vm-hi1620-2p1g @@ -1,4 +1,3 @@ -arch: aarch64 provider: qemu template: kvm nr_cpu: 2 diff --git a/hosts/vm-hi1620-2p4g b/hosts/vm-hi1620-2p4g index 83d8133..f2a5b5e 100644 --- a/hosts/vm-hi1620-2p4g +++ b/hosts/vm-hi1620-2p4g @@ -1,4 +1,3 @@ -arch: aarch64 provider: qemu template: kvm nr_cpu: 2 diff --git a/hosts/vm-hi1620-2p8g b/hosts/vm-hi1620-2p8g index a4a0577..1780524 100644 --- a/hosts/vm-hi1620-2p8g +++ b/hosts/vm-hi1620-2p8g @@ -1,4 +1,3 @@ -arch: aarch64 provider: qemu template: kvm nr_cpu: 2 -- 2.23.0

2 1

[PATCH v2 compass-ci 2/2] job.cr: add a key "kernel_version" for initramfs
by Xu Xijian 29 Oct '20

29 Oct '20

When run job with initramfs, there is a default combination of kernel, modules and headers, and I add a key "kernel_version" to make it optional. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- src/lib/job.cr | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/lib/job.cr b/src/lib/job.cr index 7fbc414..88f64ab 100644 --- a/src/lib/job.cr +++ b/src/lib/job.cr @@ -86,6 +86,7 @@ class Job kernel_append_root kernel_params docker_image + kernel_version ) macro method_missing(call) @@ -134,6 +135,7 @@ class Job set_result_service() set_os_mount() set_depends_initrd() + set_kernel_version() set_initrds_uri() set_kernel_uri() set_kernel_append_root() @@ -293,8 +295,9 @@ class Job end private def set_kernel_uri + vmlinuz_sub_path = (("#{kernel_version}" == "default") ? "vmlinuz" : "boot/vmlinuz-#{kernel_version}") self["kernel_uri"] = "kernel #{OS_HTTP_PREFIX}" + - "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/vmlinuz")}" + "#{JobHelper.service_path("#{SRV_OS}/#{os_dir}/#{vmlinuz_sub_path}")}" end private def kernel_common_params @@ -315,10 +318,15 @@ class Job temp_initrds = [] of String osimage_dir = "#{SRV_INITRD}/osimage/#{os_dir}" + boot_dir = "#{SRV_OS}/#{os_dir}/boot" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/current")}" temp_initrds << "#{INITRD_HTTP_PREFIX}" + "#{JobHelper.service_path("#{osimage_dir}/run-ipconfig.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{boot_dir}/modules-#{kernel_version}.cgz")}" + temp_initrds << "#{OS_HTTP_PREFIX}" + + "#{JobHelper.service_path("#{boot_dir}/headers-#{kernel_version}.cgz")}" temp_initrds.concat(initrd_deps.split(/ /)) unless initrd_deps.empty? temp_initrds.concat(initrd_pkg.split(/ /)) unless initrd_pkg.empty? @@ -359,6 +367,10 @@ class Job return basenames end + private def set_kernel_version + self["kernel_version"] ||= "default" + end + private def set_initrds_uri uris = "" -- 2.23.0

2 2

[PATCH v2 compass-ci 1/2] sparrow/0-package/os: skip when intsall failed
by Xu Xijian 29 Oct '20

29 Oct '20

[why] When install several packages, if one of them is installed failed, should go ahead to install next packages. [how] Add "--skip-broken" for "yum install" cmd. Add "--fix-missing" for "apt-get install" cmd. Signed-off-by: Xu Xijian <xuxijian(a)huawei.com> --- sparrow/0-package/os/centos | 2 +- sparrow/0-package/os/debian | 2 +- sparrow/0-package/os/openEuler | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sparrow/0-package/os/centos b/sparrow/0-package/os/centos index 261592c..4243f99 100755 --- a/sparrow/0-package/os/centos +++ b/sparrow/0-package/os/centos @@ -22,4 +22,4 @@ pkgs=( busybox ) -yum install -y "${pkgs[@]}" +yum install -y --skip-broken "${pkgs[@]}" diff --git a/sparrow/0-package/os/debian b/sparrow/0-package/os/debian index 020c34a..16ef0a9 100755 --- a/sparrow/0-package/os/debian +++ b/sparrow/0-package/os/debian @@ -20,4 +20,4 @@ pkgs=( busybox ) -apt-get install -y "${pkgs[@]}" +apt-get install -y --fix-missing "${pkgs[@]}" diff --git a/sparrow/0-package/os/openEuler b/sparrow/0-package/os/openEuler index 5c64fe8..ba298c8 100755 --- a/sparrow/0-package/os/openEuler +++ b/sparrow/0-package/os/openEuler @@ -21,7 +21,7 @@ pkgs=( busybox ) -yum install -y "${pkgs[@]}" +yum install -y --skip-broken "${pkgs[@]}" wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… wget http://rpmfind.net/linux/openmandriva/cooker/repository/aarch64/main/releas… -- 2.23.0

1 0

[PATCH v2 compass-ci] feat: container/ntp-server: network time synchronization
by Wang Chenglong 29 Oct '20

29 Oct '20

[Why] By container to provide network time synchronization service for virtual and physical machines. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/Dockerfile | 16 ++++++++ container/ntp-server/build | 5 +++ container/ntp-server/ntp.conf | 57 ++++++++++++++++++++++++++++ container/ntp-server/start | 16 ++++++++ container/ntp-server/start-server.sh | 7 ++++ 5 files changed, 101 insertions(+) create mode 100644 container/ntp-server/Dockerfile create mode 100755 container/ntp-server/build create mode 100644 container/ntp-server/ntp.conf create mode 100755 container/ntp-server/start create mode 100755 container/ntp-server/start-server.sh diff --git a/container/ntp-server/Dockerfile b/container/ntp-server/Dockerfile new file mode 100644 index 0000000..6d95bf2 --- /dev/null +++ b/container/ntp-server/Dockerfile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:7 + +RUN yum repolist +RUN yum -y install ntp \ + && yum clean all + +COPY ntp.conf /etc/ntp.conf +COPY start-server.sh / + +EXPOSE 123 + +ENTRYPOINT ["/start-server.sh"] +CMD ["sh"] diff --git a/container/ntp-server/build b/container/ntp-server/build new file mode 100755 index 0000000..c02152a --- /dev/null +++ b/container/ntp-server/build @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t ntp_server . diff --git a/container/ntp-server/ntp.conf b/container/ntp-server/ntp.conf new file mode 100644 index 0000000..3152fd3 --- /dev/null +++ b/container/ntp-server/ntp.conf @@ -0,0 +1,57 @@ +For more information about this file, see the ntp.conf(5) man page. + +# Record the frequency of the system clock. +driftfile /var/lib/ntp/drift + +# Permit time synchronization with our time source, but do not +# permit the source to query or modify the service on this system. +restrict default nomodify notrap nopeer noepeer noquery + +# Permit association with pool servers. +restrict source nomodify notrap noepeer noquery + +# Permit all access over the loopback interface. This could +# be tightened as well, but to do so would effect some of +# the administrative functions. +restrict 127.0.0.1 +restrict ::1 + +# Hosts on local network are less restricted. +restrict 172.0.0.0 mask 255.0.0.0 nomodify notrap + +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html). +# pool 2.openEuler.pool.ntp.org iburst +server 0.centos.pool.ntp.org +server 1.centos.pool.ntp.org +server 2.centos.pool.ntp.org +server 3.centos.pool.ntp.org + +server 127.127.1.0 +fudge 127.127.1.0 stratum 8 + + +# Reduce the maximum number of servers used from the pool. +tos maxclock 5 + +# Enable public key cryptography. +# crypto + +includefile /etc/ntp/crypto/pw + +# Key file containing the keys and key identifiers used when operating +# with symmetric key cryptography. +keys /etc/ntp/keys + +# Specify the key identifiers which are trusted. +# trustedkey 4 8 42 + +# Specify the key identifier to use with the ntpdc utility. +# requestkey 8 + +# Specify the key identifier to use with the ntpq utility. +# controlkey 8 + +# Enable writing of statistics records. +# statistics clockstats cryptostats loopstats peerstats + diff --git a/container/ntp-server/start b/container/ntp-server/start new file mode 100755 index 0000000..6e7479e --- /dev/null +++ b/container/ntp-server/start @@ -0,0 +1,16 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ../defconfig.sh + +docker_rm ntp_server +cmd=( + docker run + -id + --name=ntp_server + -p 123:123/udp + ntp_server:latest +) + +"${cmd[@]}" diff --git a/container/ntp-server/start-server.sh b/container/ntp-server/start-server.sh new file mode 100755 index 0000000..8f35f22 --- /dev/null +++ b/container/ntp-server/start-server.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +/usr/sbin/ntpd -g -l /var/log/ntpstats/ntpd.log + +exec "$@" -- 2.23.0

2 2

[PATCH compass-ci] feat: container/ntp-server: network time synchronization
by Wang Chenglong 29 Oct '20

29 Oct '20

By container to provides network time synchronization service for virtual and physical machines. Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- container/ntp-server/Dockerfile | 16 ++++++++ container/ntp-server/build | 5 +++ container/ntp-server/ntp.conf | 57 ++++++++++++++++++++++++++++ container/ntp-server/start | 16 ++++++++ container/ntp-server/start-server.sh | 7 ++++ 5 files changed, 101 insertions(+) create mode 100644 container/ntp-server/Dockerfile create mode 100755 container/ntp-server/build create mode 100644 container/ntp-server/ntp.conf create mode 100755 container/ntp-server/start create mode 100755 container/ntp-server/start-server.sh diff --git a/container/ntp-server/Dockerfile b/container/ntp-server/Dockerfile new file mode 100644 index 0000000..6d95bf2 --- /dev/null +++ b/container/ntp-server/Dockerfile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM centos:7 + +RUN yum repolist +RUN yum -y install ntp \ + && yum clean all + +COPY ntp.conf /etc/ntp.conf +COPY start-server.sh / + +EXPOSE 123 + +ENTRYPOINT ["/start-server.sh"] +CMD ["sh"] diff --git a/container/ntp-server/build b/container/ntp-server/build new file mode 100755 index 0000000..c02152a --- /dev/null +++ b/container/ntp-server/build @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t ntp_server . diff --git a/container/ntp-server/ntp.conf b/container/ntp-server/ntp.conf new file mode 100644 index 0000000..3152fd3 --- /dev/null +++ b/container/ntp-server/ntp.conf @@ -0,0 +1,57 @@ +For more information about this file, see the ntp.conf(5) man page. + +# Record the frequency of the system clock. +driftfile /var/lib/ntp/drift + +# Permit time synchronization with our time source, but do not +# permit the source to query or modify the service on this system. +restrict default nomodify notrap nopeer noepeer noquery + +# Permit association with pool servers. +restrict source nomodify notrap noepeer noquery + +# Permit all access over the loopback interface. This could +# be tightened as well, but to do so would effect some of +# the administrative functions. +restrict 127.0.0.1 +restrict ::1 + +# Hosts on local network are less restricted. +restrict 172.0.0.0 mask 255.0.0.0 nomodify notrap + +# Use public servers from the pool.ntp.org project. +# Please consider joining the pool (http://www.pool.ntp.org/join.html). +# pool 2.openEuler.pool.ntp.org iburst +server 0.centos.pool.ntp.org +server 1.centos.pool.ntp.org +server 2.centos.pool.ntp.org +server 3.centos.pool.ntp.org + +server 127.127.1.0 +fudge 127.127.1.0 stratum 8 + + +# Reduce the maximum number of servers used from the pool. +tos maxclock 5 + +# Enable public key cryptography. +# crypto + +includefile /etc/ntp/crypto/pw + +# Key file containing the keys and key identifiers used when operating +# with symmetric key cryptography. +keys /etc/ntp/keys + +# Specify the key identifiers which are trusted. +# trustedkey 4 8 42 + +# Specify the key identifier to use with the ntpdc utility. +# requestkey 8 + +# Specify the key identifier to use with the ntpq utility. +# controlkey 8 + +# Enable writing of statistics records. +# statistics clockstats cryptostats loopstats peerstats + diff --git a/container/ntp-server/start b/container/ntp-server/start new file mode 100755 index 0000000..6e7479e --- /dev/null +++ b/container/ntp-server/start @@ -0,0 +1,16 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. ../defconfig.sh + +docker_rm ntp_server +cmd=( + docker run + -id + --name=ntp_server + -p 123:123/udp + ntp_server:latest +) + +"${cmd[@]}" diff --git a/container/ntp-server/start-server.sh b/container/ntp-server/start-server.sh new file mode 100755 index 0000000..8f35f22 --- /dev/null +++ b/container/ntp-server/start-server.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# SPDX-License-Identifier: MulanPSL-2.0+ +# # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +/usr/sbin/ntpd -g -l /var/log/ntpstats/ntpd.log + +exec "$@" -- 2.23.0

2 2

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

29 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 e5955d0..48794f5 100755 --- a/sparrow/2-network/iptables +++ b/sparrow/2-network/iptables @@ -25,3 +25,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

1 0

[PATCH lkp-tests] jobs/build-pkg.yaml: add pkgbuild_repo examples
by Lin Jiaxin 29 Oct '20

29 Oct '20

[why] pkgbuild_repo field's parameter format is not uniform for different git repository. Novices are easy to make mistakes. [how] Add examples of three types of git repository used by build-pkg. Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- jobs/build-pkg.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jobs/build-pkg.yaml b/jobs/build-pkg.yaml index 5888838a..b17fd2ad 100644 --- a/jobs/build-pkg.yaml +++ b/jobs/build-pkg.yaml @@ -1,4 +1,9 @@ suite: build-pkg category: functional +# pkgbuild_repo examples +# pkgbuild_repo: archlinux/aur-j/java8-openjdk +# pkgbuild_repo: archlinux/community//keepalived/trunk +# pkgbuild_repo: archlinux/packages//prometheus-node-exporter/trunk + build-pkg: -- 2.23.0

3 4

[PATCH compass-ci] sched: consume job from queues
by Cao Xueliang 29 Oct '20

29 Oct '20

[why] Before, we consume job from the queue which has relation with tbox_group. Now, we consume job from the queue which is setted by mac2queues. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- src/lib/sched.cr | 69 +++++++++++++++++++++++++++++++++----- src/scheduler/scheduler.cr | 2 +- 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/src/lib/sched.cr b/src/lib/sched.cr index c32091f..d8d0338 100644 --- a/src/lib/sched.cr +++ b/src/lib/sched.cr @@ -240,10 +240,10 @@ class Sched response = add_job(job, job_id) message = (response["error"]? ? response["error"]["root_cause"] : "") job_messages << { - "job_id" => job_id, - "message" => message.to_s, - "job_state" => "submit", - "result_root" => "/srv#{job.result_root}" + "job_id" => job_id, + "message" => message.to_s, + "job_state" => "submit", + "result_root" => "/srv#{job.result_root}", } return job_messages if response["error"]? end @@ -292,10 +292,10 @@ class Sched message = (response["error"]? ? response["error"]["root_cause"] : "") return [{ - "job_id" => job_id, - "message" => message.to_s, - "job_state" => "submit", - "result_root" => "/srv#{job.result_root}" + "job_id" => job_id, + "message" => message.to_s, + "job_state" => "submit", + "result_root" => "/srv#{job.result_root}", }] end @@ -378,6 +378,59 @@ class Sched end end + def rand_queues(queues) + return queues if queues.empty? + + queues_size = queues.size + base = Random.rand(queues_size) + temp_queues = [] of String + + (0..queues_size - 1).each do |index| + temp_queues << queues[(index + base) % queues_size] + end + + return temp_queues + end + + def get_queues(mac) + queues = [] of String + + queues_str = @redis.hash_get("sched/mac2queues", normalize_mac(mac)) + return queues unless queues_str + + queues_str.split(',', remove_empty: true) do |item| + queues << item.strip + end + + return rand_queues(queues) + end + + def get_job_from_queues(queues, testbox) + job = nil + + queues.each do |queue| + job = prepare_job("sched/#{queue}", testbox) + return job if job + end + + return job + end + + def get_job_boot(env : HTTP::Server::Context) + value = env.params.url["value"] + boot_type = env.params.url["boot_type"] + testbox = @redis.hash_get("sched/mac2host", normalize_mac(value)) + + queues = get_queues(value) + job = get_job_from_queues(queues, testbox) + + if job + Jobfile::Operate.create_job_cpio(job.dump_to_json_any, Kemal.config.public_folder) + end + + return boot_content(job, boot_type) + end + def find_job_boot(env : HTTP::Server::Context) api_param = env.params.url["value"] diff --git a/src/scheduler/scheduler.cr b/src/scheduler/scheduler.cr index 371e4ed..1bfea02 100644 --- a/src/scheduler/scheduler.cr +++ b/src/scheduler/scheduler.cr @@ -51,7 +51,7 @@ module Scheduler # /boot.yyy/mac/${mac} get "/boot.:boot_type/:parameter/:value" do |env| env.response.headers["Connection"] = "close" - response = sched.find_job_boot(env) + response = sched.get_job_boot(env) job_id = response[/tmpfs\/(.*)\/job\.cgz/, 1]? puts %({"job_id": "#{job_id}", "job_state": "boot"}) if job_id -- 2.23.0

3 2

[PATCH compass-ci] delimiter: delete tbox_group settings
by Cao Xueliang 29 Oct '20

29 Oct '20

[why] Use the original tbox_group of the job. Signed-off-by: Cao Xueliang <caoxl78320(a)163.com> --- lib/git_bisect.rb | 4 +--- src/delimiter/constants.rb | 1 - src/delimiter/find-commit/bisect_run_script.rb | 9 +++------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/git_bisect.rb b/lib/git_bisect.rb index d9e5cf4..c548861 100644 --- a/lib/git_bisect.rb +++ b/lib/git_bisect.rb @@ -42,7 +42,6 @@ class GitBisect @bad_job.delete('stats') @bad_job.delete('id') @bad_job.delete('error_ids') - @bad_job['tbox_group'] = DELIMITER_TBOX_GROUP end def set_upstream @@ -75,8 +74,7 @@ class GitBisect result = `git -C #{@work_dir} bisect start #{@upstream_commit} #{@good_commit}` temp = result.split(/\n/) if temp[0].include? 'Bisecting' - result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} "#{@error_id}" \ - "#{DELIMITER_TBOX_GROUP}" #{@work_dir}` + result = `git -C #{@work_dir} bisect run #{BISECT_RUN_SCRIPT} #{@bad_job_id} "#{@error_id}" #{@work_dir}` end FileUtils.rm_r(@work_dir) if Dir.exist?(@work_dir) puts "\nbisect result: #{result}" diff --git a/src/delimiter/constants.rb b/src/delimiter/constants.rb index dafc2c8..93b633d 100644 --- a/src/delimiter/constants.rb +++ b/src/delimiter/constants.rb @@ -9,4 +9,3 @@ 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-2p8g--delimiter' diff --git a/src/delimiter/find-commit/bisect_run_script.rb b/src/delimiter/find-commit/bisect_run_script.rb index 539599f..d5e4226 100755 --- a/src/delimiter/find-commit/bisect_run_script.rb +++ b/src/delimiter/find-commit/bisect_run_script.rb @@ -10,18 +10,16 @@ require_relative "#{ENV['CCI_SRC']}/src/delimiter/utils" # git bisect run class GitBisectRun - def initialize(job_id, error_id, tbox_group, work_dir) + def initialize(job_id, error_id, work_dir) @es = ESQuery.new @job_id = job_id @error_id = error_id - @tbox_group = tbox_group @work_dir = work_dir end def git_bisect job = @es.query_by_id @job_id job.delete('stats') if job.key?('stats') - job['tbox_group'] = @tbox_group commit = `git -C #{@work_dir} log --pretty=format:"%H" -1` job['upstream_commit'] = commit get_bisect_status job @@ -41,8 +39,7 @@ end job_id = ARGV[0] error_id = ARGV[1] -tbox_group = ARGV[2] -work_dir = ARGV[3] +work_dir = ARGV[2] -run = GitBisectRun.new job_id, error_id, tbox_group, work_dir +run = GitBisectRun.new job_id, error_id, work_dir run.git_bisect -- 2.23.0

1 0

[PATCH compass-ci] container/rsync-server: modify data upload directory
by Cui Yili 29 Oct '20

29 Oct '20

[why] Modify data upload directory to upload qemu image. [how] Change the rsync.conf configuration and docker operating parameters. Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/rsync-server/rsyncd.conf | 6 ++++-- container/rsync-server/start | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/container/rsync-server/rsyncd.conf b/container/rsync-server/rsyncd.conf index 528e8bd..dd8f128 100644 --- a/container/rsync-server/rsyncd.conf +++ b/container/rsync-server/rsyncd.conf @@ -1,10 +1,12 @@ uid = lkp gid = lkp +port = 11387 use chroot = no +log file=/var/log/rsync.log -[result] -path = /result +[upload] +path = /srv/initrd/qemu-image read only = no max connections = 200 refuse options = delete diff --git a/container/rsync-server/start b/container/rsync-server/start index 4124192..6fa3de2 100755 --- a/container/rsync-server/start +++ b/container/rsync-server/start @@ -9,9 +9,9 @@ cmd=( docker run -id --name=rsync_server - -v /srv/result:/result + -v /srv/initrd/qemu-image:/srv/initrd/qemu-image -v /etc/localtime:/etc/localtime:ro - -p 873:873 + -p 11387:11387 rsync_server:latest ) -- 2.23.0

2 1

2025

2024

2023

2022

2021

2020

Compass-ci