- Compass-ci - mailweb.openeuler.org

[PATCH compass-ci 3/3] build-my-info: fix name mismatches
by Wu Fengguang 09 Jan '21

09 Jan '21

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- sbin/build-my-info.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index d0ee46e..fd75f51 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -15,11 +15,11 @@ option = { options = OptionParser.new do |opts| opts.on('-e email', 'my_email') do |email| - option[:email] = email + option[:my_email] = email end opts.on('-n name', 'my_name') do |name| - option[:name] = name + option[:my_name] = name end opts.on('-l lab', 'lab') do |lab| -- 2.23.0

1 0

[PATCH compass-ci 2/3] build-my-info: set default values
by Wu Fengguang 09 Jan '21

09 Jan '21

Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- sbin/build-my-info.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index 0b16884..d0ee46e 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -7,7 +7,12 @@ require_relative '../lib/es_client' require_relative '../lib/build_my_info_client' require 'optparse' -option = {} +option = { + my_name: `git config --global user.name`.chomp, + my_email: `git config --global user.email`.chomp, + lab: `awk '/^lab:\s/ {print $2; exit}' /etc/compass-ci/defaults/*.yaml`.chomp +} + options = OptionParser.new do |opts| opts.on('-e email', 'my_email') do |email| option[:email] = email -- 2.23.0

1 0

[PATCH compass-ci 1/3] build-my-info: fix white space style
by Wu Fengguang 09 Jan '21

09 Jan '21

Layout/SpaceAroundOperators: Surrounding space missing for operator `=`. Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn> --- sbin/build-my-info.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb index cd824c6..0b16884 100755 --- a/sbin/build-my-info.rb +++ b/sbin/build-my-info.rb @@ -8,7 +8,7 @@ require_relative '../lib/build_my_info_client' require 'optparse' option = {} -options= OptionParser.new do |opts| +options = OptionParser.new do |opts| opts.on('-e email', 'my_email') do |email| option[:email] = email end -- 2.23.0

1 0

[PATCH v2 compass-ci] container/openresty-proxy-cache: add nginx.conf
by cuiyili 08 Jan '21

08 Jan '21

http/https cache proxy and request forwarding processing Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/openresty-proxy-cache/nginx.conf | 118 +++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100755 container/openresty-proxy-cache/nginx.conf diff --git a/container/openresty-proxy-cache/nginx.conf b/container/openresty-proxy-cache/nginx.conf new file mode 100755 index 0000000..2e83286 --- /dev/null +++ b/container/openresty-proxy-cache/nginx.conf @@ -0,0 +1,118 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ + +user nobody; +worker_processes auto; +pid /run/nginx.pid; + +events {} + +http { + proxy_cache_path /nginx_cache levels=1:2 keys_zone=my_cache:10m max_size=10g + inactive=6000m use_temp_path=off; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for" ' + '"$upstream_cache_status" $body_bytes_sent'; + access_log /tmp/access.log main; + error_log /tmp/error.log; + + resolver 8.8.8.8; + client_max_body_size 700m; + server_tokens off; + + proxy_cache my_cache; + proxy_ignore_headers Set-Cookie Cache-Control Expires; + proxy_cache_valid 200 1440m; + proxy_cache_valid 301 302 5m; + proxy_set_header X-Real-Ip $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + add_header X-Cache $upstream_cache_status; + add_header X-Via $server_addr; + + server { + listen 443 ssl; + ssl_certificate /cert/ca.crt; + ssl_certificate_key /cert/ca.key; + proxy_connect; + proxy_connect_allow 443; + + location / { + allow all; + proxy_ssl_server_name on; + set_by_lua_block $cur_ups { + uri = ngx.var.request_uri + host = ngx.var.http_host + + path_file = "/srv/initrd/tar/"..uri + local f = io.open(path_file) + if f then + return "/127.0.0.1:443/tar/"..uri + end + return uri + } + proxy_pass $scheme:/$cur_ups; + } + + location /tar { + allow all; + root /srv/initrd; + autoindex on; + autoindex_exact_size off; + } + + } + server { + listen 80; + proxy_connect; + proxy_connect_allow 443; + + location / { + allow all; + + content_by_lua_block { + local http = require "resty.http" + local httpc = http.new() + uri = ngx.var.request_uri + host = ngx.var.http_host + if string.find(host, "11333") then + h="" + else + h="/"..host + end + path_file = "/srv/initrd/tar/"..h..uri + + local f = io.open(path_file) + if f then + url_forward = "http://127.0.0.1:80/tar/"..h..uri + else + url_forward = "http:/"..h..uri + end + + res, error = httpc:request_uri(url_forward) + if res then + ngx.status = res.status + for k, v in pairs(res.headers) do + if k ~= "Transfer-Encoding" and k ~= "Connection" then + ngx.header[k] = v + end + end + ngx.say(res.body) + else + ngx.exit(ngx.HTTP_FORBIDDEN) + end + httpc:close() + + } + } + + location /tar { + allow all; + root /srv/initrd; + autoindex on; + autoindex_exact_size off; + } + + } +} -- 2.23.0

1 0

[PATCH v2 compass-ci] container/openresty-proxy-cache: add start script
by cuiyili 08 Jan '21

08 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/openresty-proxy-cache/start | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 container/openresty-proxy-cache/start diff --git a/container/openresty-proxy-cache/start b/container/openresty-proxy-cache/start new file mode 100755 index 0000000..a1f095d --- /dev/null +++ b/container/openresty-proxy-cache/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 + +docker_rm openresty-proxy-cache + +cmd=( + docker run -d + --name openresty-proxy-cache + --restart=always + -p 11333:80 + -p 11334:443 + -v $PWD/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf + -v /srv/initrd/tar:/srv/initrd/tar:ro + -v /etc/localtime:/etc/localtime:ro + openresty:proxy_cache +) + +"${cmd[@]}" -- 2.23.0

1 0

[PATCH compass-ci] lua_script/forward.lua: http/https request forwarding processing
by cuiyili 08 Jan '21

08 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- .../lua_script/forward.lua | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 container/openresty-proxy-cache/lua_script/forward.lua diff --git a/container/openresty-proxy-cache/lua_script/forward.lua b/container/openresty-proxy-cache/lua_script/forward.lua new file mode 100755 index 0000000..bd54742 --- /dev/null +++ b/container/openresty-proxy-cache/lua_script/forward.lua @@ -0,0 +1,32 @@ +local http = require "resty.http" +local httpc = http.new() +uri = ngx.var.request_uri +host = ngx.var.http_host +if string.find(host, "11333") then + h="" +else + h="/"..host +end +path_file = "/srv/initrd/tar/"..h..uri + +local f = io.open(path_file) +if f then + url_forward = "http://127.0.0.1:80/tar/"..h..uri +else + url_forward = "http:/"..h..uri +end + +res, error = httpc:request_uri(url_forward) +if res then + ngx.status = res.status + for k, v in pairs(res.headers) do + if k ~= "Transfer-Encoding" and k ~= "Connection" then + ngx.header[k] = v + end + end + ngx.say(res.body) +else + ngx.exit(ngx.HTTP_FORBIDDEN) +end + +httpc:close() -- 2.23.0

1 0

[PATCH v2 compass-ci] container/openresty-proxy-cache: add nginx.conf
by cuiyili 08 Jan '21

08 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/openresty-proxy-cache/nginx.conf | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 container/openresty-proxy-cache/nginx.conf diff --git a/container/openresty-proxy-cache/nginx.conf b/container/openresty-proxy-cache/nginx.conf new file mode 100755 index 0000000..e3f11e0 --- /dev/null +++ b/container/openresty-proxy-cache/nginx.conf @@ -0,0 +1,85 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ + +user nobody; +worker_processes auto; +pid /run/nginx.pid; + +events {} + +http { + proxy_cache_path /nginx_cache levels=1:2 keys_zone=my_cache:10m max_size=10g + inactive=6000m use_temp_path=off; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for" ' + '"$upstream_cache_status" $body_bytes_sent'; + access_log /tmp/access.log main; + error_log /tmp/error.log; + + resolver 8.8.8.8; + client_max_body_size 700m; + server_tokens off; + + proxy_cache my_cache; + proxy_ignore_headers Set-Cookie Cache-Control Expires; + proxy_cache_valid 200 1440m; + proxy_cache_valid 301 302 5m; + proxy_set_header X-Real-Ip $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + add_header X-Cache $upstream_cache_status; + add_header X-Via $server_addr; + + server { + listen 443 ssl; + ssl_certificate /cert/ca.crt; + ssl_certificate_key /cert/ca.key; + proxy_connect; + proxy_connect_allow 443; + + location / { + allow all; + proxy_ssl_server_name on; + set_by_lua_block $cur_ups { + uri = ngx.var.request_uri + host = ngx.var.http_host + + path_file = "/srv/initrd/tar/"..uri + local f = io.open(path_file) + if f then + return "/127.0.0.1:443/tar/"..uri + end + return uri + } + proxy_pass $scheme:/$cur_ups; + } + + location /tar { + allow all; + root /srv/initrd; + autoindex on; + autoindex_exact_size off; + } + + } + server { + listen 80; + proxy_connect; + proxy_connect_allow 443; + + location / { + allow all; + + content_by_lua_file lua_script/forward.lua; + } + + location /tar { + allow all; + root /srv/initrd; + autoindex on; + autoindex_exact_size off; + } + + } +} -- 2.23.0

1 0

[PATCH lkp-tests] hosts/dc-*g: add nr_cpu
by Hu Xuejiao 08 Jan '21

08 Jan '21

[why] Because when job.rb(expand_params) deal with params/nr_threads [ ($1.to_f * nr_cpu / 100).to_i ], it will handle the exception --"rescue KeyError"-- in running docker [so] i need add the nr_cpu in dc-*g Signed-off-by: Hu XueJiao <1034502035(a)qq.com> --- hosts/dc-1g | 1 + hosts/dc-2g | 1 + hosts/dc-4g | 1 + hosts/dc-8g | 1 + 4 files changed, 4 insertions(+) diff --git a/hosts/dc-1g b/hosts/dc-1g index ec1e59b9..24ff4227 100644 --- a/hosts/dc-1g +++ b/hosts/dc-1g @@ -1 +1,2 @@ +nr_cpu: 1 memory: 1g diff --git a/hosts/dc-2g b/hosts/dc-2g index b9509a2c..82c2522e 100644 --- a/hosts/dc-2g +++ b/hosts/dc-2g @@ -1 +1,2 @@ +nr_cpu: 2 memory: 2g diff --git a/hosts/dc-4g b/hosts/dc-4g index 52e0636d..30353733 100644 --- a/hosts/dc-4g +++ b/hosts/dc-4g @@ -1 +1,2 @@ +nr_cpu: 4 memory: 4g diff --git a/hosts/dc-8g b/hosts/dc-8g index 333d6250..470f3094 100644 --- a/hosts/dc-8g +++ b/hosts/dc-8g @@ -1 +1,2 @@ +nr_cpu: 8 memory: 8g -- 2.23.0

1 0

[PATCH compass-ci] container/openresty-proxy-cache: add nginx.conf
by cuiyili 08 Jan '21

08 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/openresty-proxy-cache/nginx.conf | 85 ++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100755 container/openresty-proxy-cache/nginx.conf diff --git a/container/openresty-proxy-cache/nginx.conf b/container/openresty-proxy-cache/nginx.conf new file mode 100755 index 0000000..79aa10e --- /dev/null +++ b/container/openresty-proxy-cache/nginx.conf @@ -0,0 +1,85 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ + +user nobody; +worker_processes auto; +pid /run/nginx.pid; + +events {} + +http { + proxy_cache_path /nginx_cache levels=1:2 keys_zone=my_cache:10m max_size=10g + inactive=6000m use_temp_path=off; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for" ' + '"$upstream_cache_status" $body_bytes_sent'; + access_log /tmp/access.log main; + error_log /tmp/error.log; + + resolver 8.8.8.8; + client_max_body_size 700m; + server_tokens off; + + proxy_cache my_cache; + proxy_ignore_headers Set-Cookie Cache-Control Expires; + proxy_cache_valid 200 1440m; + proxy_cache_valid 301 302 5m; + proxy_set_header X-Real-Ip $remote_addr; + proxy_set_header X-Forwarded-For $remote_addr; + add_header X-Cache $upstream_cache_status; + add_header X-Via $server_addr; + + server { + listen 443 ssl; + ssl_certificate /cert/ca.crt; + ssl_certificate_key /cert/ca.key; + proxy_connect; + proxy_connect_allow 443; + + location / { + allow all; + proxy_ssl_server_name on; + set_by_lua_block $cur_ups { + uri = ngx.var.request_uri + host = ngx.var.http_host + + path_file = "/srv/initrd/tar/"..uri + local f = io.open(path_file) + if f then + return "/127.0.0.1:443/tar/"..uri + end + return uri + } + proxy_pass $scheme:/$cur_ups; + } + + location /tar { + allow all; + root /srv/initrd; + autoindex on; + autoindex_exact_size off; + } + + } + server { + listen 80; + proxy_connect; + proxy_connect_allow 443; + + location / { + allow all; + + content_by_lua_file lua_script/forward.lua; + } + + location /tar { + allow all; + root /srv/initrd; + autoindex on; + autoindex_exact_size off; + } + + } +} -- 2.23.0

1 0

[PATCH compass-ci] container/openresty-proxy-cache: add start script
by cuiyili 08 Jan '21

08 Jan '21

Signed-off-by: cuiyili <2268260388(a)qq.com> --- container/openresty-proxy-cache/start | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 container/openresty-proxy-cache/start diff --git a/container/openresty-proxy-cache/start b/container/openresty-proxy-cache/start new file mode 100755 index 0000000..b946426 --- /dev/null +++ b/container/openresty-proxy-cache/start @@ -0,0 +1,23 @@ +#!/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 + +docker_rm openresty-proxy-cache + +cmd=( + docker run -d + --name openresty-proxy-cache + --restart=always + -p 11333:80 + -p 11334:443 + -v $PWD/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf + -v $PWD/lua_script/forward.lua:/usr/local/openresty/nginx/lua_script/forward.lua + -v /srv/initrd/tar:/srv/initrd/tar:ro + -v /etc/localtime:/etc/localtime:ro + openresty:proxy_cache +) + +"${cmd[@]}" -- 2.23.0

1 0