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

[PATCH v5 lkp-tests] pkg: add mysql
by Lin Jiaxin 18 Nov '20

18 Nov '20

sysbench-mysql need to test with mysql8.0.17 Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> Signed-off-by: Zhang Yu <2134782174(a)qq.com> --- ...00-mysql-add-fstack-protector-strong.patch | 20 ++++++ pkg/mysql/PKGBUILD | 60 +++++++++++++++++ pkg/mysql/my.cnf | 67 +++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 pkg/mysql/0000-mysql-add-fstack-protector-strong.patch create mode 100644 pkg/mysql/PKGBUILD create mode 100644 pkg/mysql/my.cnf diff --git a/pkg/mysql/0000-mysql-add-fstack-protector-strong.patch b/pkg/mysql/0000-mysql-add-fstack-protector-strong.patch new file mode 100644 index 00000000..23c07c87 --- /dev/null +++ b/pkg/mysql/0000-mysql-add-fstack-protector-strong.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/build_configurations/compiler_options.cmake b/cmake/build_configurations/compiler_options.cmake +index fecf2a2..f3e012f 100644 +--- a/cmake/build_configurations/compiler_options.cmake ++++ b/cmake/build_configurations/compiler_options.cmake +@@ -43,6 +43,7 @@ IF(UNIX) + # Default GCC flags + IF(CMAKE_COMPILER_IS_GNUCC) + SET(COMMON_C_FLAGS "-fno-omit-frame-pointer") ++ SET(COMMON_C_FLAGS "-fstack-protector-strong") + # Disable inline optimizations for valgrind testing to avoid false positives + IF(WITH_VALGRIND) + STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ") +@@ -57,6 +58,7 @@ IF(UNIX) + ENDIF() + IF(CMAKE_COMPILER_IS_GNUCXX) + SET(COMMON_CXX_FLAGS "-std=c++14 -fno-omit-frame-pointer") ++ SET(COMMON_CXX_FLAGS "-fstack-protector-strong") + # Disable inline optimizations for valgrind testing to avoid false positives + IF(WITH_VALGRIND) + STRING_PREPEND(COMMON_CXX_FLAGS "-fno-inline ") diff --git a/pkg/mysql/PKGBUILD b/pkg/mysql/PKGBUILD new file mode 100644 index 00000000..8869e62b --- /dev/null +++ b/pkg/mysql/PKGBUILD @@ -0,0 +1,60 @@ +pkgname=mysql +pkgver=8.0.17 +pkgrel=3 +arch=('aarch64' 'x86_64') +url="http://www.mysql.com" +license=('GPLv2') +source=("https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-$pkgver.tar.gz" + "0000-mysql-add-fstack-protector-strong.patch" + "https://mirrors.huaweicloud.com/kunpeng/archive/openEuler/patch/database/my…" + "my.cnf") +md5sums=('7472a25d91973cbba5d8a8f176a3080b' '6e853850efbd6f887ac3e13b1bf99cc4' 'f13eb11de53616017f7428cc06d4e242' '7bb0372ec4e9281813a9afc67c6cfc20') + +prepare() +{ + cd $srcdir/$pkgname-$pkgver + patch -p1 < ../0000-mysql-add-fstack-protector-strong.patch +} + +build() +{ + build_getcpu + build_mysql +} + +build_mysql() +{ + cd $srcdir/$pkgname-$pkgver + + CMAKE=cmake + grep -sqF "CentOS Linux release 7" /etc/centos-release && CMAKE=cmake3 + + $CMAKE . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DMYSQL_DATADIR=/data/mysql/data -DSYSCONFDIR=/etc \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 -DWITH_FEDERATED_STORAGE_ENGINE=1 \ + -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_MYISAM_STORAGE_ENGINE=1 \ + -DENABLED_LOCAL_INFILE=1 -DENABLE_DTRACE=0 -DDEFAULT_CHARSET=utf8mb4 -DDEFAULT_COLLATION=utf8mb4_general_ci \ + -DWITH_EMBEDDED_SERVER=1 -DDOWNLOAD_BOOST=1 -DWITH_BOOST=./boost -DFORCE_INSOURCE_BUILD=1 + make -j8 +} + +build_getcpu() +{ + cd $srcdir + tar -zxvf getcpu.tgz + + cd getcpu || exit + make +} + + +package() +{ + mkdir -p $pkgdir/getcpu + cp getcpu/getcpu-hi.ko $pkgdir/getcpu/ + + mkdir -p $pkgdir/etc + cp my.cnf $pkgdir/etc/ + + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/pkg/mysql/my.cnf b/pkg/mysql/my.cnf new file mode 100644 index 00000000..9732af40 --- /dev/null +++ b/pkg/mysql/my.cnf @@ -0,0 +1,67 @@ +[mysqld_safe] +log-error=/data/mysql/log/mysql.log +pid-file=/data/mysql/run/mysqld.pid +[mysqldump] +quick +[mysql] +[client] +default-character-set=utf8mb4 +socket=/data/mysql/run/mysql.sock + +[mysqld] +socket=/data/mysql/run/mysql.sock +tmpdir=/data/mysql/tmp +datadir=/data/mysql/data +default_authentication_plugin=mysql_native_password +port=3309 +user=mysql +memlock=on +bind-address=0.0.0.0 +skip-grant-tables + +lc-messages=en_US +lc-messages-dir=/usr/local/mysql/share + +innodb_page_size=64k +max_connections=4000 +back_log=2048 +performance_schema=OFF +max_prepared_stmt_count=128000 + +#file +innodb_file_per_table +innodb_log_file_size=2048M +innodb_log_files_in_group=32 +innodb_open_files=10000 +table_open_cache_instances=64 + +#buffers +innodb_buffer_pool_size=128G +innodb_buffer_pool_instances=64 +innodb_log_buffer_size=2048M + +#tune +sync_binlog=0 +innodb_flush_log_at_trx_commit=0 +innodb_use_native_aio=1 +innodb_spin_wait_delay=160 +innodb_sync_spin_loops=20 +innodb_flush_method=O_DIRECT +innodb_io_capacity=30000 +innodb_io_capacity_max=40000 +innodb_lru_scan_depth=9000 +innodb_page_cleaners=1 +innodb_spin_wait_pause_multiplier=25 + +#perf special +innodb_flush_neighbors=0 +innodb_write_io_threads=1 +innodb_read_io_threads=1 +innodb_purge_threads=1 + +sql_mode=STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION,NO_AUTO_VALUE_ON_ZERO,STRICT_ALL_TABLES + +#skop_log_bin +ssl=0 + +table_open_cache=15000 -- 2.23.0

2 1

[PATCH v5 lkp-tests] tests/cci-makepkg: add download PKGBUILD patch function
by Lin Jiaxin 18 Nov '20

18 Nov '20

[Why] Support more version's PKGBUILD. [How] Download the required file through remote-git from /srv/git/pkg/ usage: job yaml add new field: PKGBUILD_TAG About $PKGBUILD_TAG, it is from PKGBUILD file's $pkgver-$pkgrel. example: PKGBUILD_TAG: 1.0-20 You should create a git repo that name same as $benchmark in /srv/git/pkg/ before you add PKGBUILD_TAG to yaml. If not, cci-makepkg will report an error. And everything same as before if no PKGBUILD_TAG. Signed-off-by: Lin Jiaxin <ljx.joe(a)qq.com> --- tests/cci-makepkg | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/cci-makepkg b/tests/cci-makepkg index 44be44b3..530c9fef 100755 --- a/tests/cci-makepkg +++ b/tests/cci-makepkg @@ -39,12 +39,29 @@ cd $LKP_SRC/pkg/$benchmark || die "pkg is empty" mount -t cifs -o guest,vers=1.0,noacl,nouser_xattr //$LKP_SERVER$PKG_MNT $PKG_MNT || die "Failed to run mount" } +curl_pkgfile() +{ + curl -sS -H 'Content-Type: Application/json' -XPOST "$LKP_SERVER"':8100/git_command' \ + -d '{"git_repo": "'$1'", "git_command": ["git-show", "HEAD:'$2'"]}' -o "$2" +} + +download_pkgfile() +{ + local pkg_tag_file="PKGBUILD-$PKGBUILD_TAG" + + curl_pkgfile "pkg/$benchmark" "$pkg_tag_file" + + [ -f "$pkg_tag_file" ] || die "$pkg_tag_file not exist" + [ -s "$pkg_tag_file" ] || die "$pkg_tag_file is empty" +} + get_pkg_info() { var=$1 pkg_dir=${2:-.} ( . $pkg_dir/PKGBUILD + [ -n "$PKGBUILD_TAG" ] && . $pkg_dir/PKGBUILD-$PKGBUILD_TAG eval echo '$'$var ) } @@ -71,6 +88,8 @@ update_shared_pkg() echo "update shared pkg link ${benchmark}.cgz -> ${bm_name}/${cgz_name}" } +[ -n "$PKGBUILD_TAG" ] && download_pkgfile + distro_install_depends lkp-dev [ $os = "centos" ] && -- 2.23.0

2 1

[PATCH v2 lkp-tests] spec/submit_spec: change existing spec cases input and output directory
by Wei Jihui 18 Nov '20

18 Nov '20

[Why] we will add more spec cases, so it should give each type of cases for different input and output directories. [How] move existing spec case to link_jobs, they all from lkp-tests/jobs. Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- spec/submit/ftq.yaml | 1 - .../ftq/ftq-1000-2-100000ss-add.yaml | 0 .../ftq/ftq-10000-2-100000ss-add.yaml | 0 .../ftq/ftq-20-2-6000ss-cache.yaml | 0 ...-68000000-1-65535-set_get-never-never.yaml | 0 spec/submit/redis.yaml | 1 - spec/submit_spec.rb | 26 +++++++++---------- 7 files changed, 13 insertions(+), 15 deletions(-) delete mode 120000 spec/submit/ftq.yaml rename spec/submit/{ => link_jobs}/ftq/ftq-1000-2-100000ss-add.yaml (100%) rename spec/submit/{ => link_jobs}/ftq/ftq-10000-2-100000ss-add.yaml (100%) rename spec/submit/{ => link_jobs}/ftq/ftq-20-2-6000ss-cache.yaml (100%) rename spec/submit/{ => link_jobs}/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml (100%) delete mode 120000 spec/submit/redis.yaml diff --git a/spec/submit/ftq.yaml b/spec/submit/ftq.yaml deleted file mode 120000 index 0ba22f05..00000000 --- a/spec/submit/ftq.yaml +++ /dev/null @@ -1 +0,0 @@ -../../jobs/ftq.yaml \ No newline at end of file diff --git a/spec/submit/ftq/ftq-1000-2-100000ss-add.yaml b/spec/submit/link_jobs/ftq/ftq-1000-2-100000ss-add.yaml similarity index 100% rename from spec/submit/ftq/ftq-1000-2-100000ss-add.yaml rename to spec/submit/link_jobs/ftq/ftq-1000-2-100000ss-add.yaml diff --git a/spec/submit/ftq/ftq-10000-2-100000ss-add.yaml b/spec/submit/link_jobs/ftq/ftq-10000-2-100000ss-add.yaml similarity index 100% rename from spec/submit/ftq/ftq-10000-2-100000ss-add.yaml rename to spec/submit/link_jobs/ftq/ftq-10000-2-100000ss-add.yaml diff --git a/spec/submit/ftq/ftq-20-2-6000ss-cache.yaml b/spec/submit/link_jobs/ftq/ftq-20-2-6000ss-cache.yaml similarity index 100% rename from spec/submit/ftq/ftq-20-2-6000ss-cache.yaml rename to spec/submit/link_jobs/ftq/ftq-20-2-6000ss-cache.yaml diff --git a/spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml b/spec/submit/link_jobs/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml similarity index 100% rename from spec/submit/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml rename to spec/submit/link_jobs/redis/redis-1-cs-localhost-even-1024-68000000-5-3-4-68000000-1-65535-set_get-never-never.yaml diff --git a/spec/submit/redis.yaml b/spec/submit/redis.yaml deleted file mode 120000 index 196e182b..00000000 --- a/spec/submit/redis.yaml +++ /dev/null @@ -1 +0,0 @@ -../../jobs/redis.yaml \ No newline at end of file diff --git a/spec/submit_spec.rb b/spec/submit_spec.rb index 69bd58af..983d050e 100644 --- a/spec/submit_spec.rb +++ b/spec/submit_spec.rb @@ -21,19 +21,19 @@ def traverse_file(output_dir) end describe 'submit job spec' do - Dir.glob("#{LKP_SRC}/spec/submit/*.yaml").each do |yaml_file| - job_name = File.basename(yaml_file, '.yaml') - output_dir = "#{LKP_SRC}/spec/submit/#{job_name}" - it 'save atomic yaml' do - submit_cmd = [ - "#{LKP_SRC}/sbin/submit", - '-o', output_dir, - '-s', 'lab: spec_lab', - '-s', 'testbox: vm-2p8g--spec_submit', - yaml_file - ] - system(*submit_cmd) - traverse_file(output_dir) + it 'link jobs spec' do + Dir.glob("#{LKP_SRC}/spec/submit/link_jobs/*.yaml").each do |yaml_file| + job_name = File.basename(yaml_file, '.yaml') + output_dir = "#{LKP_SRC}/spec/submit/link_jobs/#{job_name}" + submit_cmd = [ + "#{LKP_SRC}/sbin/submit", + '-o', output_dir, + '-s', 'lab: spec_lab', + '-s', 'testbox: vm-2p8g--spec_submit', + yaml_file + ] + system(*submit_cmd) + traverse_file(output_dir) end end end -- 2.23.0

1 0

[PATCH compass-ci] container: add other group read permission
by Bai Jing 18 Nov '20

18 Nov '20

Signed-off-by: Bai Jing <799286817(a)qq.com> --- container/conserver/start | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container/conserver/start b/container/conserver/start index 58b2242..4354630 100755 --- a/container/conserver/start +++ b/container/conserver/start @@ -31,3 +31,5 @@ cmd=( ) "${cmd[@]}" + +chmod o+r /srv/cci/serial/logs/* -- 2.23.0

2 2

[PATCH v3 lkp-tests 2/2] spec/stats/iozone: add test case for iozone
by Lu Kaiyi 18 Nov '20

18 Nov '20

Signed-off-by: Lu Kaiyi <2392863668(a)qq.com> --- spec/stats/iozone/1 | 32 ++++++++++++++++++++++++++++++++ spec/stats/iozone/1.yaml | 14 ++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 spec/stats/iozone/1 create mode 100644 spec/stats/iozone/1.yaml diff --git a/spec/stats/iozone/1 b/spec/stats/iozone/1 new file mode 100644 index 00000000..cd579643 --- /dev/null +++ b/spec/stats/iozone/1 @@ -0,0 +1,32 @@ +2020-11-17 14:30:58 iozone -r 256k -s 4g -i 0 -i 1 -i 2 -f /fs/sda/iozonetest & +2020-11-17 14:30:58 wait + Iozone: Performance Test of File I/O + Version $Revision: 3.479 $ + Compiled for 64 bit mode. + Build: linux + + Contributors:William Norcott, Don Capps, Isom Crawford, Kirby Collins + Al Slater, Scott Rhine, Mike Wisner, Ken Goss + Steve Landherr, Brad Smith, Mark Kelly, Dr. Alain CYR, + Randy Dunlap, Mark Montague, Dan Million, Gavin Brebner, + Jean-Marc Zucconi, Jeff Blomberg, Benny Halevy, Dave Boone, + Erik Habbinga, Kris Strecker, Walter Wong, Joshua Root, + Fabrice Bacchella, Zhenghua Xue, Qin Li, Darren Sawyer, + Vangel Bojaxhi, Ben England, Vikentsi Lapa, + Alexey Skidanov. + + Run began: Tue Nov 17 14:30:58 2020 + + Record Size 256 kB + File size set to 4194304 kB + Command line used: iozone -r 256k -s 4g -i 0 -i 1 -i 2 -f /fs/sda/iozonetest + Output is in kBytes/sec + Time Resolution = 0.000001 seconds. + Processor cache size set to 1024 kBytes. + Processor cache line size set to 32 bytes. + File stride size set to 17 * record size. + random random bkwd record stride + kB reclen write rewrite read reread read write read rewrite read fwrite frewrite fread freread + 4194304 256 14257802 15088999 8516076 8375138 5221373 5382018 + +iozone test complete. diff --git a/spec/stats/iozone/1.yaml b/spec/stats/iozone/1.yaml new file mode 100644 index 00000000..441d76ef --- /dev/null +++ b/spec/stats/iozone/1.yaml @@ -0,0 +1,14 @@ +4194304KB_256reclen.write: 14257802 +4194304KB_256reclen.rewrite: 15088999 +4194304KB_256reclen.read: 8516076 +4194304KB_256reclen.reread: 8375138 +4194304KB_256reclen.random_read: 5221373 +4194304KB_256reclen.random_write: 5382018 +write_KBps: 1096754.0 +rewrite_KBps: 1160692.2307692308 +read_KBps: 655082.7692307692 +reread_KBps: 644241.3846153846 +random_read_KBps: 401644.07692307694 +random_write_KBps: 414001.3846153846 +4194304KB_256reclen: 56841406.0 +average_KBps: 4372415.846153846 -- 2.23.0

2 1

[PATCH v7 compass-ci] make the container/initrd-cifs to share /srv/initrd
by Xiao Shenwei 18 Nov '20

18 Nov '20

[why] our os-cifs container will mount three dir, /srv/os, /srv/initrd, /srv/result in order to reduce the coupling, need split them [how] one folder mount by one container [usage] Two ways for the client to mount initrd: 1. initrd mount -t cifs -o guest,port=446 //ip/initrd /tmp/initrd 2. osimage: for lkp compatibility mount -t cifs -o guest,port=446 //ip/osimage /tmp/osimage --- container/initrd-cifs/Dockerfile | 24 ++++++++++++++++++++ container/initrd-cifs/build | 5 +++++ container/initrd-cifs/smb.conf | 38 ++++++++++++++++++++++++++++++++ container/initrd-cifs/start | 24 ++++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100644 container/initrd-cifs/Dockerfile create mode 100755 container/initrd-cifs/build create mode 100644 container/initrd-cifs/smb.conf create mode 100755 container/initrd-cifs/start diff --git a/container/initrd-cifs/Dockerfile b/container/initrd-cifs/Dockerfile new file mode 100644 index 0000000..d4496bf --- /dev/null +++ b/container/initrd-cifs/Dockerfile @@ -0,0 +1,24 @@ +# Origin: https://github.com/Stanback/alpine-samba +# Copyright (C) 2016-2020 Eric D. Stanback +# SPDX-License-Identifier: GPL-3.0 + +FROM alpine:edge + +MAINTAINER Xiao Shenwei <xiaoshenwei96(a)163.com> + +RUN sed -ri.origin 's|^https?://dl-cdn.alpinelinux.org|http://mirrors.huaweicloud.com|g' /etc/apk/repositories + +RUN adduser -u 1090 -D lkp + +RUN apk add --update \ + samba-common-tools \ + samba-client \ + samba-server \ + bash +RUN rm -rf /var/cache/apk/* + +COPY ./smb.conf /etc/samba/ + +EXPOSE 446/tcp + +ENTRYPOINT ["smbd", "--foreground", "--no-process-group", "--log-stdout"] diff --git a/container/initrd-cifs/build b/container/initrd-cifs/build new file mode 100755 index 0000000..4b93647 --- /dev/null +++ b/container/initrd-cifs/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 initrd-cifs . diff --git a/container/initrd-cifs/smb.conf b/container/initrd-cifs/smb.conf new file mode 100644 index 0000000..eaddef7 --- /dev/null +++ b/container/initrd-cifs/smb.conf @@ -0,0 +1,38 @@ +# refer to https://lkml.org/lkml/2019/7/16/716 and https://lkml.org/lkml/2019/9/19/586 +[global] + workgroup = MYGROUP + server string = Samba Server + map to guest = Bad User + load printers = no + printing = bsd + printcap name = /dev/null + disable spoolss = yes + disable netbios = yes + server role = standalone + server services = -dns, -nbt + smb ports = 445 + create mode = 0777 + directory mode = 0777 + guest only = yes + guest ok = yes + server min protocol = NT1 + unix extensions = yes + mangled names = no + +[initrd] + path = /srv/initrd/ + comment = initrd + browseable = yes + writable = yes + public = yes + force user = lkp + force group = lkp + +[osimage] + path = /srv/initrd/ + comment = osimage + browseable = yes + writable = yes + public = yes + force user = lkp + force group = lkp diff --git a/container/initrd-cifs/start b/container/initrd-cifs/start new file mode 100755 index 0000000..77558a1 --- /dev/null +++ b/container/initrd-cifs/start @@ -0,0 +1,24 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +. $CCI_SRC/container/defconfig.sh + +lsmod | grep -q "^cifs\s" || { + sudo modprobe cifs +} + +docker_rm initrd-cifs + +cmd=( + docker run + -d + -p 446:445 + -v /etc/localtime:/etc/localtime:ro + -v /srv/initrd:/srv/initrd + --name initrd-cifs + --restart=always + initrd-cifs +) + +"${cmd[@]}" -- 2.23.0

3 4

[PATCH v6 lkp-tests] add: sysbench-threads-git result parsing file
by Hu Xuejiao 18 Nov '20

18 Nov '20

[input] General statistics: total time: 0.3987s total number of events: 10000 total time taken by event execution: 0.3971 response time: min: 0.04ms [output] total time: 0.3987s Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- stats/sysbench-threads-git | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 stats/sysbench-threads-git diff --git a/stats/sysbench-threads-git b/stats/sysbench-threads-git new file mode 100755 index 00000000..b7a88534 --- /dev/null +++ b/stats/sysbench-threads-git @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# General statistics: +# total time: 0.2671s +# total number of events: 10000 +# total time taken by event execution: 0.3971s +# response time: +# min: 0.04ms + + +$stdin.each_line do |line| + next unless line =~ /^\s+total time:\s+([0-9.]+)/ + + puts "total time: #{$1.to_f}s" +end + + -- 2.23.0

2 1

[PATCH compass-ci] sparrow/3-code: add ENV INITRD_HTTP_HOST and OS_HTTP_HOST default values
by Liu Yinsi 18 Nov '20

18 Nov '20

Using the default value server_ip is convenient for customers to set up compass CI locally. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index 77027d9..8928816 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -6,6 +6,8 @@ server_name=$(hostname | cut -f1 -d.) server_ip=$(ip route get 1.2.3.4 | awk '{print $7; exit}') : ${sched_host:=$server_ip} : ${sched_port:=3000} +: ${os_http_host:=$server_ip} +: ${initrd_http_host:=$server_ip} : ${initrd_http_port:=8800} : ${MASTER_FLUENTD_HOST:=$server_ip} : ${MASTER_FLUENTD_PORT:=24224} -- 2.23.0

1 0

[PATCH v4 compass-ci] sbin/docker-pull: fix failed to pull image from local repository
by Liu Yinsi 18 Nov '20

18 Nov '20

[why] lys@crystal ~/compass-ci/sbin% ./docker-pull centos:7 pull image from local repository Error response from daemon: manifest for 127.0.0.1:5001/centos:7 not found pull image from docker hub 7: Pulling from library/centos Digest: sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430789b60e Status: Image is up to date for centos:7 [how] if pull image failed from local repository, it will pull from docker hub, so hide error info for first failed pull. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sbin/docker-pull | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/docker-pull b/sbin/docker-pull index 5972913..d69af64 100755 --- a/sbin/docker-pull +++ b/sbin/docker-pull @@ -14,7 +14,7 @@ image_name=$1 local_repository() { echo "pull image from local repository" - docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name && { + docker pull $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name 2> /dev/null && { docker tag $DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/$image_name $image_name } } -- 2.23.0

1 0

[PATCH v3 compass-ci] providers/docker: fix failed to pull image from local repository
by Liu Yinsi 18 Nov '20

18 Nov '20

[why] lys@crystal ~/compass-ci/providers% ./my-docker Donehttp://$DOCKER_REGISTRY_HOST:$DOCKER_REGISTRY_PORT/boot.container/hostname/dc-1g.lys-501708 pull image from local repository Error response from daemon: manifest for 127.0.0.1:5001/centos:7 not found pull image from docker hub 7: Pulling from library/centos [how] if pull image failed from local repository, it will pull from docker hub, so hide error info for first failed pull. Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- providers/docker/docker.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/docker/docker.rb b/providers/docker/docker.rb index 8e489c6..849ea22 100755 --- a/providers/docker/docker.rb +++ b/providers/docker/docker.rb @@ -80,7 +80,7 @@ end def start_container(hostname, load_path, hash) docker_image = hash['docker_image'] - system "#{ENV['CCI_SRC']}/sbin/docker-pull #{docker_image}" + system "#{ENV['CCI_SRC']}/sbin/docker-pull #{docker_image} 2> /dev/null" system( { 'hostname' => hostname, 'docker_image' => docker_image, 'load_path' => load_path }, ENV['CCI_SRC'] + '/providers/docker/run.sh' -- 2.23.0

3 4

2024

2023

2022

2021

2020

Compass-ci November 2020