- Compass-ci - mailweb.openeuler.org

[PATCH v4 lkp-tests 5/5] new reset-tbox job yaml and script
by Zhang Dewan 20 Jan '21

20 Jan '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- tests/reset-tbox | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/reset-tbox b/tests/reset-tbox index 4d2c191e..37c23759 100755 --- a/tests/reset-tbox +++ b/tests/reset-tbox @@ -30,7 +30,7 @@ tbox_check() reset_tbox() { echo "reboot the tesetbox..." - ipmitool -I lanplus -H $ibmc_ip -U $iBMC_user -P $iBMC_passwd power reset + ipmitool -I lanplus -H $ibmc_ip -U $iBMC_user -P $iBMC_passwd power reset } result_check() @@ -38,7 +38,7 @@ result_check() if [ $? -ne 0 ] ; then echo "Failed to reboot the testbox: $host_name" fi - echo "done." + echo "done." } main() -- 2.23.0

1 0

[PATCH v4 lkp-tests 3/5] modify test/reset-tbox
by Zhang Dewan 20 Jan '21

20 Jan '21

at the test just now, "testbox: dc-8g" is need. Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- tests/reset-tbox | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/reset-tbox b/tests/reset-tbox index 1ca17bfd..36aa37d5 100755 --- a/tests/reset-tbox +++ b/tests/reset-tbox @@ -1,11 +1,11 @@ #!/bin/bash -# host_nameset +# - host_nameset account_file=/etc/lab/.account.info hosts_file=/etc/lab/hosts_file command_file=/usr/bin/ipmitool -FileCheck() +file_check() { for i in $account_file $hosts_file $command_file do @@ -17,7 +17,7 @@ FileCheck() source $account_file } -TboxCheck() +tbox_check() { ibmc_ip=$(grep -w $host_name $hosts_file | awk '{print $1}') @@ -27,13 +27,13 @@ TboxCheck() } } -ResetTbox() +reset_tbox() { echo "reboot the tesetbox..." ipmitool -I lanplus -H $ibmc_ip -U $iBMC_user -P $iBMC_passwd power reset } -ResultCheck() +result_check() { if [ $? -ne 0 ] ; then echo "Failed to reboot the testbox: $host_name" @@ -43,10 +43,10 @@ ResultCheck() main() { - FileCheck - TboxCheck - ResetTbox - ResultCheck + file_check + tbox_check + reset_tbox + result_check } main -- 2.23.0

1 0

[PATCH v4 lkp-tests 2/5] alter reset-tbox.yaml
by Zhang Dewan 20 Jan '21

20 Jan '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- jobs/reset-tbox.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/reset-tbox.yaml b/jobs/reset-tbox.yaml index 4d43850f..216a3852 100644 --- a/jobs/reset-tbox.yaml +++ b/jobs/reset-tbox.yaml @@ -3,7 +3,7 @@ category: functional testbox: dc-8g os_mount: container -docker_image: 172.168.131.2:5001/reset-tbox +docker_image: reset-tbox:latest queue: reset-tbox reset-tbox: -- 2.23.0

1 0

[PATCH v4 lkp-tests 1/5] reset machine testbox by job
by Zhang Dewan 20 Jan '21

20 Jan '21

Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- jobs/reset-tbox.yaml | 10 ++++++++ tests/reset-tbox | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 jobs/reset-tbox.yaml create mode 100755 tests/reset-tbox diff --git a/jobs/reset-tbox.yaml b/jobs/reset-tbox.yaml new file mode 100644 index 00000000..4d43850f --- /dev/null +++ b/jobs/reset-tbox.yaml @@ -0,0 +1,10 @@ +suite: reset-tbox +category: functional + +testbox: dc-8g +os_mount: container +docker_image: 172.168.131.2:5001/reset-tbox +queue: reset-tbox + +reset-tbox: + host_name: diff --git a/tests/reset-tbox b/tests/reset-tbox new file mode 100755 index 00000000..1ca17bfd --- /dev/null +++ b/tests/reset-tbox @@ -0,0 +1,54 @@ +#!/bin/bash +# host_nameset + +account_file=/etc/lab/.account.info +hosts_file=/etc/lab/hosts_file +command_file=/usr/bin/ipmitool + +FileCheck() +{ + for i in $account_file $hosts_file $command_file + do + [ -f $i ] || { + echo "File not found: $i" + exit 0 + } + done + source $account_file +} + +TboxCheck() +{ + ibmc_ip=$(grep -w $host_name $hosts_file | awk '{print $1}') + + [[ "$ibmc_ip" =~ ^[0-9]+.* ]] || { + echo "Testbox not found: $host_name" + exit 1 + } +} + +ResetTbox() +{ + echo "reboot the tesetbox..." + ipmitool -I lanplus -H $ibmc_ip -U $iBMC_user -P $iBMC_passwd power reset +} + +ResultCheck() +{ + if [ $? -ne 0 ] ; then + echo "Failed to reboot the testbox: $host_name" + fi + echo "done." +} + +main() +{ + FileCheck + TboxCheck + ResetTbox + ResultCheck +} +main + + + -- 2.23.0

1 0

[PATCH compass-ci 5/5] upload-libvirt/nginx.conf: nginx.conf in upload-libvirt container
by cuiyili 20 Jan '21

20 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/upload-libvirt/nginx.conf | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 container/upload-libvirt/nginx.conf diff --git a/container/upload-libvirt/nginx.conf b/container/upload-libvirt/nginx.conf new file mode 100644 index 0000000..6b2892b --- /dev/null +++ b/container/upload-libvirt/nginx.conf @@ -0,0 +1,43 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ + +user lkp; +worker_processes auto; +pid /run/nginx.pid; + +events {} + +http { + server { + listen 3081; + server_name "upload-libvirt"; + server_tokens off; + client_max_body_size 50m; + access_log /tmp/access.log; + error_log /tmp/error.log; + + location / { + allow all; + root /srv/cci/libvirt-xml/; + + autoindex on; + create_full_put_path on; + dav_methods PUT MKCOL; + dav_access user:rw group:rw all:rw; + content_by_lua_block { + ngx.req.read_body() + local filename = string.gsub(ngx.var.request_uri, "/", "") + if string.match(filename, "([^/]+).xml$") then + add_path = string.match(filename, "([^/]+).xml$") + local data = ngx.req.get_body_data() + local file = io.open("/srv/cci/libvirt-xml/"..filename, "w") + file:write(data) + file:close() + file_md5 = io.popen("cd /srv/cci/libvirt-xml/ && file_md5=$(md5sum "..filename.." | awk '{print $1}') && mkdir -p "..add_path.." && mv "..filename.." "..add_path.."/${file_md5}.xml && echo ${file_md5}"):read() + ngx.say(add_path.."/"..tostring(file_md5)..".xml") + end + } + } + + } +} -- 2.23.0

1 0

[PATCH compass-ci 4/5] upload-libvirt/start: start upload-libvirt docker container
by cuiyili 20 Jan '21

20 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/upload-libvirt/start | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 container/upload-libvirt/start diff --git a/container/upload-libvirt/start b/container/upload-libvirt/start new file mode 100755 index 0000000..5d149ad --- /dev/null +++ b/container/upload-libvirt/start @@ -0,0 +1,22 @@ +#!/bin/bash +# Refer to: https://hub.docker.com/r/openresty/openresty +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. +# SPDX-License-Identifier: MulanPSL-2.0+ + +. $CCI_SRC/container/defconfig.sh + +: ${UPLOAD_LIBVIRT_PORT:=3081} +docker_rm upload-libvirt + +cmd=( + docker run -d + --name upload-libvirt + --restart=always + -p ${UPLOAD_LIBVIRT_PORT}:3081 + -v $PWD/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf + -v /etc/localtime:/etc/localtime:ro + -v /srv/cci/libvirt-xml:/srv/cci/libvirt-xml + upload-libvirt +) + +"${cmd[@]}" -- 2.23.0

1 0

[PATCH compass-ci 3/5] upload-libvirt/openresty.sh: start openresty in upload-libvirt docker image
by cuiyili 20 Jan '21

20 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/upload-libvirt/openresty.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 container/upload-libvirt/openresty.sh diff --git a/container/upload-libvirt/openresty.sh b/container/upload-libvirt/openresty.sh new file mode 100755 index 0000000..0a54b5e --- /dev/null +++ b/container/upload-libvirt/openresty.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# SPDX-License-Identifier: MulanPSL-2.0+ + +umask 002 +/usr/local/openresty/bin/openresty -g 'daemon off;' -- 2.23.0

1 0

[PATCH compass-ci 2/5] upload-libvirt/build: add upload-libvirt docker image
by cuiyili 20 Jan '21

20 Jan '21

Add upload-libvirt docker image in order to upload libvirt xml file. Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/upload-libvirt/build | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 container/upload-libvirt/build diff --git a/container/upload-libvirt/build b/container/upload-libvirt/build new file mode 100755 index 0000000..bda6a3e --- /dev/null +++ b/container/upload-libvirt/build @@ -0,0 +1,7 @@ +#!/bin/bash +# Origin: https://hub.docker.com/r/openresty/openresty +# Copyright (C) 2016-2020 Eric D. Evan Wies +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +docker build -t upload-libvirt . -- 2.23.0

1 0

[PATCH compass-ci 1/5] upload-libvirt/Dockerfile: add upload-libvirt docker image
by cuiyili 20 Jan '21

20 Jan '21

Add upload-libvirt docker image in order to upload libvirt xml file. Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/upload-libvirt/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 container/upload-libvirt/Dockerfile diff --git a/container/upload-libvirt/Dockerfile b/container/upload-libvirt/Dockerfile new file mode 100644 index 0000000..db48bcb --- /dev/null +++ b/container/upload-libvirt/Dockerfile @@ -0,0 +1,14 @@ +# Origin: https://hub.docker.com/r/openresty/openresty +# Copyright (C) 2016-2020 Eric D. Evan Wies +# SPDX-License-Identifier: MulanPSL-2.0+ +# Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. + +FROM openresty/openresty:alpine + +RUN apk add bash +RUN mkdir -p /var/log/nginx/ +RUN adduser lkp -u 1090 -g 1090 -D + +COPY ./openresty.sh /usr/local/bin/ + +CMD ["/usr/local/bin/openresty.sh"] -- 2.23.0

1 0

[PATCH v3 lkp-tests 3/3] modify test/reset-tbox
by Zhang Dewan 20 Jan '21

20 Jan '21

at the test just now, "testbox: dc-8g" is need. Signed-off-by: Zhang Dewan <513619464(a)qq.com> --- tests/reset-tbox | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/reset-tbox b/tests/reset-tbox index 1ca17bfd..36aa37d5 100755 --- a/tests/reset-tbox +++ b/tests/reset-tbox @@ -1,11 +1,11 @@ #!/bin/bash -# host_nameset +# - host_nameset account_file=/etc/lab/.account.info hosts_file=/etc/lab/hosts_file command_file=/usr/bin/ipmitool -FileCheck() +file_check() { for i in $account_file $hosts_file $command_file do @@ -17,7 +17,7 @@ FileCheck() source $account_file } -TboxCheck() +tbox_check() { ibmc_ip=$(grep -w $host_name $hosts_file | awk '{print $1}') @@ -27,13 +27,13 @@ TboxCheck() } } -ResetTbox() +reset_tbox() { echo "reboot the tesetbox..." ipmitool -I lanplus -H $ibmc_ip -U $iBMC_user -P $iBMC_passwd power reset } -ResultCheck() +result_check() { if [ $? -ne 0 ] ; then echo "Failed to reboot the testbox: $host_name" @@ -43,10 +43,10 @@ ResultCheck() main() { - FileCheck - TboxCheck - ResetTbox - ResultCheck + file_check + tbox_check + reset_tbox + result_check } main -- 2.23.0

2 2