- Compass-ci - mailweb.openeuler.org

[PATCH v3 compass-ci 2/4] assign-account: add new function and optimize
by Luan Shengde 26 Nov '20

26 Nov '20

[why] meet new options for answerback-email meet update configuration function for answerback-email [how] add new function for the new options for answerback-email optimize current function to enable update Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/get_account_info.rb | 117 +++++++++++++++---- 1 file changed, 92 insertions(+), 25 deletions(-) diff --git a/container/assign-account/get_account_info.rb b/container/assign-account/get_account_info.rb index 0e91057..95bec14 100755 --- a/container/assign-account/get_account_info.rb +++ b/container/assign-account/get_account_info.rb @@ -29,11 +29,14 @@ API: call graph: setup_jumper_account_info - read_account_info - build_account_name + read account + read_account_info + build_account_info + reread_account_info read_jumper_info config_default_yaml config_authorized_key + permit_login_config generate_ssh_key the returned data for setup_jumper_account_info like: @@ -41,12 +44,14 @@ the returned data for setup_jumper_account_info like: "my_login_name" => "login_name", "password" => "password", "jumper_host" => "0.0.0.0", - "jumper_port" => "10000" + "jumper_port" => "10000", + "my_jumper_pubkey" => my_jumper_pubkey } =end require 'fileutils' +require 'yaml' # get jumper and account info class AccountStorage @@ -95,14 +100,21 @@ class AccountStorage end def setup_jumper_account_info - login_name, password = read_account_info + if @data.key?('is_update_account') && @data['is_update_account'] + login_name = @data['my_login_name'] + password = reread_account_info + else + login_name, password = read_account_info + end + jumper_host, jumper_port = read_jumper_info - pub_key = @data['my_ssh_pubkey'][0] - ssh_dir = File.join('/home/', login_name, '.ssh') - config_authorized_key(login_name, pub_key, ssh_dir) unless pub_key.nil? + config_authorized_key(login_name) config_default_yaml(login_name) - my_jumper_pubkey = generate_ssh_key(login_name, ssh_dir) if @data['gen_sshkey'].eql? true + permit_login_config(login_name) + if @data.key?('gen_sshkey') && @data['gen_sshkey'] + my_jumper_pubkey = generate_ssh_key(login_name) + end jumper_account_info = { 'my_login_name' => login_name, @@ -115,34 +127,89 @@ class AccountStorage return jumper_account_info end - def generate_ssh_key(login_name, ssh_dir) + def permit_login_config(login_name) + if @data.key?('enable_login') && @data['enable_login'] + %x(usermod -s /usr/bin/zsh #{login_name}) + else + %x(usermod -s /sbin/nologin #{login_name}) + end + end + + def generate_ssh_key(login_name) + ssh_dir = File.join('/home/', login_name, '.ssh') Dir.mkdir ssh_dir, 0o700 unless File.exist? ssh_dir + pub_key_file = File.join(ssh_dir, 'id_rsa.pub') + + return if File.exist?(pub_key_file) && \ + @data['my_ssh_pubkey'].include?(File.read(pub_key_file).strip) + %x(ssh-keygen -f "#{ssh_dir}/id_rsa" -N '' -C "#{login_name}@account-vm") - %x(chown -R #{login_name}:#{login_name} #{ssh_dir}) - File.read("/home/#{login_name}/.ssh/id_rsa.pub") + + FileUtils.chown_R(login_name, login_name, ssh_dir) + File.read("/home/#{login_name}/.ssh/id_rsa.pub").strip end - def config_default_yaml(login_name) + def touch_default_yaml(login_name) default_yaml_dir = File.join('/home', login_name, '.config/compass-ci/defaults') - FileUtils.mkdir_p default_yaml_dir + FileUtils.mkdir_p default_yaml_dir unless File.exist? default_yaml_dir + + default_yaml = File.join(default_yaml_dir, 'account.yaml') + FileUtils.touch default_yaml unless File.exist? default_yaml + default_yaml + end + def config_default_yaml(login_name) + default_yaml = touch_default_yaml(login_name) + + account_yaml = YAML.load_file(default_yaml) || {} # my_email, my_name, my_uuid is required to config default yaml file # they are added along with 'my_ssh_pubkey' when sending assign account request - File.open("#{default_yaml_dir}/account.yaml", 'a') do |file| - file.puts "my_email: #{@data['my_email']}" - file.puts "my_name: #{@data['my_name']}" - file.puts "my_uuid: #{@data['my_uuid']}" - end - %x(chown -R #{login_name}:#{login_name} "/home/#{login_name}/.config") + account_yaml['my_email'] = @data['my_email'] + account_yaml['my_name'] = @data['my_name'] + account_yaml['my_uuid'] = @data['my_uuid'] + + f = File.new(default_yaml, 'w') + f.puts account_yaml.to_yaml + f.close + FileUtils.chown_R(login_name, login_name, "/home/#{login_name}/.config") + end + + def config_authorized_key(login_name) + pub_key = @data['my_ssh_pubkey'][0] + + return if pub_key.nil? + return if pub_key.strip.end_with?('account-vm') + + ssh_dir = File.join('/home/', login_name, '.ssh') + Dir.mkdir ssh_dir, 0o700 unless File.exist? ssh_dir + + authorized_file = File.join(ssh_dir, 'authorized_keys') + FileUtils.touch authorized_file unless File.exist? authorized_file + + store_pubkey(ssh_dir, login_name, authorized_file, pub_key) end - def config_authorized_key(login_name, pub_key, ssh_dir) - Dir.mkdir ssh_dir, 0o700 - Dir.chdir ssh_dir - f = File.new('authorized_keys', 'w') + def store_pubkey(ssh_dir, login_name, authorized_file, pub_key) + authorized_keys = File.read(authorized_file).split("\n") + + return if authorized_keys.include?(pub_key.strip) + + f = File.new(authorized_file, 'a') f.puts pub_key f.close - File.chmod 0o600, 'authorized_keys' - %x(chown -R #{login_name}:#{login_name} #{ssh_dir}) + + FileUtils.chown_R(login_name, login_name, ssh_dir) + File.chmod 0o600, authorized_file + end + + def reread_account_info + my_login_name_file = File.join(@account_dir, 'assigned-users', @data['my_login_name']) + + message = "No such assigned account exists: #{my_login_name_file}." + raise message unless File.exist? my_login_name_file + + password = File.readlines(my_login_name_file)[0].chomp + + return password end end -- 2.23.0

1 0

[PATCH v3 compass-ci 1/4] answerback-email: add new options
by Luan Shengde 26 Nov '20

26 Nov '20

add option for answerback-email tool -n|--name name specify my_name for user when assigning account -l|--login value enable/disable user login allowed values: y|n -u|--update enable update configuration for assigned account -u option enable update for: my_name my_ssh_pubkey generate sshkey on jumper reset user's login permission Signed-off-by: Luan Shengde <shdluan(a)163.com> --- container/assign-account/answerback-email.rb | 153 +++++++++++++++---- 1 file changed, 123 insertions(+), 30 deletions(-) diff --git a/container/assign-account/answerback-email.rb b/container/assign-account/answerback-email.rb index 5ddc451..c6bfdd3 100755 --- a/container/assign-account/answerback-email.rb +++ b/container/assign-account/answerback-email.rb @@ -14,6 +14,7 @@ require 'optparse' require_relative '../defconfig' require_relative '../../lib/es_client' require_relative 'build-send-account-email' +require_relative 'build-update-email' names = Set.new %w[ JUMPER_HOST @@ -24,7 +25,7 @@ names = Set.new %w[ defaults = relevant_defaults(names) -JUMPER_HOST = defaults['JUMPER_HOST'] || 'api.compass-ci.openeuler.org' +JUMPER_HOST = defaults['JUMPER_HOST'] JUMPER_PORT = defaults['JUMPER_PORT'] || 29999 SEND_MAIL_HOST = defaults['SEND_MAIL_HOST'] || 'localhost' SEND_MAIL_PORT = defaults['SEND_MAIL_PORT'] || 49000 @@ -33,25 +34,61 @@ my_info = { 'my_email' => nil, 'my_name' => nil, 'my_commit_url' => nil, - 'my_uuid' => %x(uuidgen).chomp, - 'my_ssh_pubkey' => [], - 'gen_sshkey' => false + 'my_uuid' => nil, + 'my_login_name' => nil, + 'my_ssh_pubkey' => [] } -def init_info(mail_content, my_info) +# stdin_info is used to store infos added with option: +# -e email_address +# -n name +# -s pubkey_file +# email_info is used to store infos parsed from email_file with option: +# -f email_file +# my_info_es is used to store info read from ES when update user +# when use --update option +# stdin_info, email_info, my_info_es have different priority +# stdin_info > email_info > my_info_es +# when assigning account or update conf for account +# if they have the same key, my_info will use the value with higher priority. +# conf_info is used to store keys used to config the account +stdin_info = {} +email_info = {} +my_info_es = {} +conf_info = { + 'gen_sshkey' => false, + 'enable_login' => true, + 'is_update_account' => false +} + +def init_info(mail_content, email_info, my_info) my_info['my_email'] = mail_content.from[0] - my_info['my_name'] = mail_content.From.unparsed_value.gsub(/ <[^<>]*>/, '') + email_info['my_name'] = mail_content.From.unparsed_value.gsub(/ <[^<>]*>/, '') return if mail_content.attachments.empty? - my_info['my_ssh_pubkey'] << mail_content.attachments[0].body.decoded + email_info['new_email_pubkey'] = mail_content.attachments[0].body.decoded.strip +end + +def read_my_login_name(my_email, my_info_es) + my_account_info_str = %x(curl -XGET localhost:9200/accounts/_doc/#{my_email}) + my_account_info = YAML.safe_load my_account_info_str + message = "No such email found from the ES: #{my_email}" + raise message unless my_account_info['found'] + + my_info_es.update my_account_info['_source'] end options = OptionParser.new do |opts| - opts.banner = 'Usage: answerback-mail.rb [-e|--email email] ' - opts.banner += "[-s|--ssh-pubkey pub_key_file] [-f|--raw-email email_file] [-g|--gen-sshkey]\n" - opts.banner += " -e or -f is required\n" + opts.banner = 'Usage: answerback-mail.rb [-e|--email email] [-n|--name name] ' + opts.banner += "[-s|--ssh-pubkey pub_key_file] [-g|--gen-sshkey] [--login y|n] [--update]\n" + opts.banner += ' answerback-mail.rb [-f|--raw-email email_file] ' + opts.banner += "[-g|--gen-sshkey] [--login y|n] [--update]\n" + opts.banner += " -e|-f is required when applying account or updating account\n" + opts.banner += " -n is required when assigning account with -e\n" opts.banner += " -s is optional when use -e\n" - opts.banner += ' -g is optional, used to generate sshkey for user' + opts.banner += " -g is optional, used to generate sshkey for user\n" + opts.banner += " -u is required when updating an account\n" + opts.banner += ' -l is optional, used to enable/disable login permission' opts.separator '' opts.separator 'options:' @@ -60,18 +97,37 @@ options = OptionParser.new do |opts| my_info['my_email'] = email_address end + opts.on('-n name', '--name name', 'appoint name') do |name| + stdin_info['my_name'] = name + end + opts.on('-s pub_key_file', '--ssh-pubkey pub_key_file', \ 'ssh pub_key file, enable password-less login') do |pub_key_file| - my_info['my_ssh_pubkey'] << File.read(pub_key_file).chomp + stdin_info['new_ssh_pubkey'] = File.read(pub_key_file).strip end opts.on('-f email_file', '--raw-email email_file', 'email file') do |email_file| mail_content = Mail.read(email_file) - init_info(mail_content, my_info) + init_info(mail_content, email_info, my_info) end - opts.on('-g', '--gen-sshkey', 'generate jumper ras public/private key and return pubkey') do - my_info['gen_sshkey'] = true + opts.on('-g', '--gen-sshkey', 'generate jumper rsa public/private key and return pubkey') do + conf_info['gen_sshkey'] = true + end + + opts.on('-u', '--update', 'updata configurations') do + read_my_login_name(my_info['my_email'], my_info_es) + conf_info['is_update_account'] = true + end + + opts.on('-l value', '--login value', 'enable/disable login, value: y|n') do |value| + if value.downcase == 'y' + conf_info['enable_login'] = true + elsif value.downcase == 'n' + conf_info['enable_login'] = false + else + raise 'invalid parameter, please use y|n' + end end opts.on_tail('-h', '--help', 'show this message') do @@ -82,33 +138,70 @@ end options.parse!(ARGV) -def apply_account(my_info) - account_info_str = %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d '#{my_info.to_json}') +def apply_account(my_info, conf_info) + apply_info = {} + apply_info.update my_info + apply_info.update conf_info + + account_info_str = %x(curl -XGET '#{JUMPER_HOST}:#{JUMPER_PORT}/assign_account' -d '#{apply_info.to_json}') JSON.parse account_info_str end -def send_account(my_info) +def check_my_email(my_info) message = "No email address specified\n" - message += "use -e to add a email address\n" - message += 'or use -f to add a email file' - raise message if my_info['my_email'].nil? + message += "use -e to add an email address for applying account\n" + message += 'or use -f to add an email file' - account_info = apply_account(my_info) - my_info['my_login_name'] = account_info['my_login_name'] + raise message if my_info['my_email'].empty? +end +def build_my_info_from_input(my_info, email_info, my_info_es, stdin_info) + new_email_pubkey = email_info.delete 'new_email_pubkey' + new_stdin_pubkey = stdin_info.delete 'new_ssh_pubkey' + new_pubkey = new_stdin_pubkey || new_email_pubkey + + my_info.update my_info_es unless my_info_es.empty? + my_info.update email_info unless email_info.empty? + my_info.update stdin_info unless stdin_info.empty? + + return if new_pubkey.nil? + return if my_info['my_ssh_pubkey'].include? new_pubkey + + my_info['my_ssh_pubkey'].insert(0, new_pubkey) +end + +def build_my_info_from_account_info(my_info, account_info, conf_info) unless account_info['my_jumper_pubkey'].nil? - my_info['my_ssh_pubkey'] << account_info['my_jumper_pubkey'].chomp + return if my_info['my_ssh_pubkey'][-1] == account_info['my_jumper_pubkey'] + + my_info['my_ssh_pubkey'] << account_info['my_jumper_pubkey'] end - my_info.delete 'gen_sshkey' + my_info['my_login_name'] = account_info['my_login_name'] unless conf_info['is_update_account'] +end + +def send_account(my_info, conf_info, email_info, my_info_es, stdin_info) + check_my_email(my_info) + my_info['my_uuid'] = %x(uuidgen).chomp unless conf_info['is_update_account'] + build_my_info_from_input(my_info, email_info, my_info_es, stdin_info) + + message = 'No my_name found, please use -n to add one' + raise message if my_info['my_name'].nil? + + account_info = apply_account(my_info, conf_info) + build_my_info_from_account_info(my_info, account_info, conf_info) + store_account_info(my_info) - send_mail(my_info, account_info) + send_mail(my_info, account_info, conf_info) end -def send_mail(my_info, account_info) - message = build_message(my_info['my_email'], account_info) - +def send_mail(my_info, account_info, conf_info) + message = if conf_info['is_update_account'] + build_update_message(my_info['my_email'], account_info, conf_info) + else + build_message(my_info['my_email'], account_info) + end %x(curl -XPOST '#{SEND_MAIL_HOST}:#{SEND_MAIL_PORT}/send_mail_text' -d "#{message}") end @@ -117,4 +210,4 @@ def store_account_info(my_info) es.put_source_by_id(my_info['my_email'], my_info) end -send_account(my_info) +send_account(my_info, conf_info, email_info, my_info_es, stdin_info) -- 2.23.0

1 0

[PATCH v4 compass-ci] doc: add manual/compass-ci测试平台使用教程--如何申请测试机.md
by Yu Chuan 26 Nov '20

26 Nov '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- ...67\346\265\213\350\257\225\346\234\272.md" | 254 ++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 "doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" diff --git "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" "b/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" new file mode 100644 index 000000000000..668ed15ba316 --- /dev/null +++ "b/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" @@ -0,0 +1,254 @@ +# 1. 前提条件 +------------- + +已经按照[apply-ssh-account.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/apply-ssh-account.md)完成如下动作： +- send apply account email. +- receive email from compass-ci(a)qq.com. +- local environment configuration. + + +# 2. 申请测试机（虚拟机） +------------------------ + +## 2.1 生成本地RSA公私钥对 + +```shell +hi684@account-vm ~% ssh-keygen -t rsa +Generating public/private rsa key pair. +Enter file in which to save the key (/home/hi684/.ssh/id_rsa): +Created directory '/home/hi684/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /home/hi684/.ssh/id_rsa. +Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. +The key fingerprint is: +SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm +The key's randomart image is: ++---[RSA 2048]----+ +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| ++----[SHA256]-----+ +hi684@account-vm ~% ls -hla .ssh +total 16K +drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . +drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. +-rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa +-rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub +``` + +## 2.2 根据需求选择yaml + +每位用户`/home/${USER}`目录下面都存放了一个lkp-tests的文件夹。 + +```shell +hi684@account-vm ~% cd lkp-tests/jobs +hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* +-rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml +-rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml +-rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml +``` + +## 2.3 提交yaml并连接测试机（虚拟机） + +```shell +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml +2020-11-26 14:44:25 +0800 WARN -- skip non-executable /home/hi684/lkp-tests/monitors/plain/wait +submit borrow-1h.yaml, got job_id=z9.170593 +query=>{"job_id":["z9.170593"]} +connect to ws://172.168.131.2:11310/filter +{"job_id":"z9.170593","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593"} +{"job_id": "z9.170593", "result_root": "/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593", "job_state": "set result root"} +{"job_id": "z9.170593", "job_state": "boot"} +{"job_id": "z9.170593", "job_state": "download"} +{"time":"2020-11-26 14:45:06","mac":"0a-1f-0d-3c-91-5c","ip":"172.18.156.13","job_id":"z9.170593","state":"running","testbox":"vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} +{"job_state":"running","job_id":"z9.170593"} +{"job_id": "z9.170593", "state": "set ssh port", "ssh_port": "51840", "tbox_name": "vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} +Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts +Warning: Permanently added '[172.168.131.2]:51840' (ECDSA) to the list of known hosts. +Last login: Wed Sep 23 11:10:58 2020 + + +Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + +System information as of time: Thu Nov 26 06:44:18 CST 2020 + +System load: 0.83 +Processes: 107 +Memory used: 6.1% +Swap used: 0.0% +Usage On: 89% +IP address: 172.18.156.13 +Users online: 1 + + + +root@vm-2p8g ~# +``` + +更多关于`submit命令如何使用`、`testbox都有什么可选项`、`如何borrow指定的操作系统`，请参见文章末尾Faq。 + +## 2.4 使用完毕退还测试机（虚拟机） + +```shell +root@vm-2p8g ~# reboot +Connection to 172.168.131.2 closed by remote host. +Connection to 172.168.131.2 closed. +hi684@account-vm ~/lkp-tests/jobs% +``` + + +# 3. 申请测试机（物理机） +------------------------ + +## 3.1 生成本地RSA公私钥对 + +```shell +hi684@account-vm ~% ssh-keygen -t rsa +Generating public/private rsa key pair. +Enter file in which to save the key (/home/hi684/.ssh/id_rsa): +Created directory '/home/hi684/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /home/hi684/.ssh/id_rsa. +Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. +The key fingerprint is: +SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm +The key's randomart image is: ++---[RSA 2048]----+ +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| ++----[SHA256]-----+ +hi684@account-vm ~% ls -hla .ssh +total 16K +drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . +drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. +-rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa +-rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub +``` + +## 3.2 根据需求选择yaml + +每位用户`/home/${USER}`目录下面都存放了一个lkp-tests的文件夹。 + +```shell +hi684@account-vm ~% cd lkp-tests/jobs +hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* +-rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml +-rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml +-rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml +``` + +## 3.3 提交yaml并连接测试机（物理机） + +```shell +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=taishan200-2280-2s64p-256g borrow-1h.yaml +2020-11-26 14:49:13 +0800 WARN -- skip non-executable /home/hi684/lkp-tests/monitors/plain/wait +submit borrow-1h.yaml, got job_id=z9.170594 +query=>{"job_id":["z9.170594"]} +connect to ws://172.168.131.2:11310/filter +{"job_id":"z9.170594","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594"} +{"job_id": "z9.170594", "result_root": "/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594", "job_state": "set result root"} +{"job_id": "z9.170594", "job_state": "boot"} +{"job_id": "z9.170594", "job_state": "download"} +{"time":"2020-11-26 14:51:56","mac":"84-46-fe-26-d3-47","ip":"172.168.178.48","job_id":"z9.170594","state":"running","testbox":"taishan200-2280-2s64p-256g--a5"} +{"job_state":"running","job_id":"z9.170594"} +{"job_id": "z9.170594", "state": "set ssh port", "ssh_port": "50420", "tbox_name": "taishan200-2280-2s64p-256g--a5"} +Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts +Warning: Permanently added '[172.168.131.2]:50420' (ECDSA) to the list of known hosts. +Last login: Wed Sep 23 11:10:58 2020 + + +Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + +System information as of time: Thu Nov 26 14:51:59 CST 2020 + +System load: 1.31 +Processes: 1020 +Memory used: 5.1% +Swap used: 0.0% +Usage On: 3% +IP address: 172.168.178.48 +Users online: 1 + + + +root@taishan200-2280-2s64p-256g--a5 ~# +``` + +更多关于`submit命令如何使用`、`testbox都有什么可选项`、`如何borrow指定的操作系统`，请参见文章末尾Faq。 + +## 3.4 使用完毕退还测试机（物理机） + +```shell +root@taishan200-2280-2s64p-256g--a5 ~# reboot +Connection to 172.168.131.2 closed by remote host. +Connection to 172.168.131.2 closed. +hi684@account-vm ~/lkp-tests/jobs% +``` + + +# 4 Faq +------- + +## 4.1 如何自行修改申请时长？ + +```shell +hi684@account-vm ~/lkp-tests/jobs% cat borrow-1h.yaml +suite: borrow +testcase: borrow + +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> +# sleep at the bottom +sleep: 1h +hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml +sleep: 1h +# 使用vim来修改你的sleep字段的值 +hi684@account-vm ~/lkp-tests/jobs% vim borrow-1h.yaml +# 修改完毕后重新submit即可 +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml +``` + +## 4.2 Submit命令指导 + +参考文档：[compass-ci测试平台使用教程--submit命令详解.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/compass-ci测试平台使用教程--submit命令详解.md) + +## 4.3 testbox都有什么可选项？ + +testbox可选项见：https://gitee.com/wu_fengguang/lab-z9/tree/master/hosts + +> 说明： +> 虚拟机的testbox: +> - vm-xxx +> +> 物理机的testbox: +> - taishan200-2280-xxx + + +> 注意： +> - 物理机的testbox若选择以`--axx`结尾的，则表示指定到了具体的某一个物理机。若此物理机任务队列中已经有任务在排队，则需要等待队列中前面的任务执行完毕后，才会轮到你提交的borrow任务。 +> - 物理机的testbox若不选择以`-axx`结尾的，表示不指定具体的某一个物理机。则此时集群中的空闲物理机会即时被分配执行你的borrow任务。 + +## 4.4 如何borrow指定的操作系统？ + +关于支持的`os`, `os_arch`, `os_version`，参见：[os-os_verison-os_arch.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/job/os-os_verison-os_arch.md) -- 2.23.0

1 0

[PATCH v3 compass-ci] doc: add manual/compass-ci测试平台使用教程--如何申请测试机.md
by Yu Chuan 26 Nov '20

26 Nov '20

Signed-off-by: Yu Chuan <13186087857(a)163.com> --- ...67\346\265\213\350\257\225\346\234\272.md" | 254 ++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 "doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" diff --git "a/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" "b/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" new file mode 100644 index 000000000000..124e68174f95 --- /dev/null +++ "b/doc/manual/compass-ci\346\265\213\350\257\225\345\271\263\345\217\260\344\275\277\347\224\250\346\225\231\347\250\213--\345\246\202\344\275\225\347\224\263\350\257\267\346\265\213\350\257\225\346\234\272.md" @@ -0,0 +1,254 @@ +# 1. 前提条件 +------------- + +已经按照[apply-ssh-account.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/apply-ssh-account.md)完成如下动作： +- send apply account email. +- receive email from compass-ci(a)qq.com. +- local environment configuration. + + +# 2. 申请测试机（虚拟机） +------------------------ + +## 2.1 生成本地RSA公私钥对 + +```shell +hi684@account-vm ~% ssh-keygen -t rsa +Generating public/private rsa key pair. +Enter file in which to save the key (/home/hi684/.ssh/id_rsa): +Created directory '/home/hi684/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /home/hi684/.ssh/id_rsa. +Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. +The key fingerprint is: +SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm +The key's randomart image is: ++---[RSA 2048]----+ +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| ++----[SHA256]-----+ +hi684@account-vm ~% ls -hla .ssh +total 16K +drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . +drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. +-rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa +-rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub +``` + +## 2.2 根据需求选择yaml + +每位用户家目录下面都存放了一个lkp-tests的文件夹 + +```shell +hi684@account-vm ~% cd lkp-tests/jobs +hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* +-rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml +-rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml +-rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml +``` + +## 2.3 提交yaml并连接测试机（虚拟机） + +```shell +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml +2020-11-26 14:44:25 +0800 WARN -- skip non-executable /home/hi684/lkp-tests/monitors/plain/wait +submit borrow-1h.yaml, got job_id=z9.170593 +query=>{"job_id":["z9.170593"]} +connect to ws://172.168.131.2:11310/filter +{"job_id":"z9.170593","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593"} +{"job_id": "z9.170593", "result_root": "/srv/result/borrow/2020-11-26/vm-2p8g/openeuler-20.03-aarch64/3600/z9.170593", "job_state": "set result root"} +{"job_id": "z9.170593", "job_state": "boot"} +{"job_id": "z9.170593", "job_state": "download"} +{"time":"2020-11-26 14:45:06","mac":"0a-1f-0d-3c-91-5c","ip":"172.18.156.13","job_id":"z9.170593","state":"running","testbox":"vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} +{"job_state":"running","job_id":"z9.170593"} +{"job_id": "z9.170593", "state": "set ssh port", "ssh_port": "51840", "tbox_name": "vm-2p8g.taishan200-2280-2s64p-256g--a38-12"} +Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts +Warning: Permanently added '[172.168.131.2]:51840' (ECDSA) to the list of known hosts. +Last login: Wed Sep 23 11:10:58 2020 + + +Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + +System information as of time: Thu Nov 26 06:44:18 CST 2020 + +System load: 0.83 +Processes: 107 +Memory used: 6.1% +Swap used: 0.0% +Usage On: 89% +IP address: 172.18.156.13 +Users online: 1 + + + +root@vm-2p8g ~# +``` + +更多关于`submit命令如何使用`、`testbox都有什么可选项`、`如何borrow指定的操作系统`，请参见文章末尾Faq。 + +## 2.4 使用完毕退还测试机（虚拟机） + +```shell +root@vm-2p8g ~# reboot +Connection to 172.168.131.2 closed by remote host. +Connection to 172.168.131.2 closed. +hi684@account-vm ~/lkp-tests/jobs% +``` + + +# 3. 申请测试机（物理机） +------------------------ + +## 3.1 生成本地RSA公私钥对 + +```shell +hi684@account-vm ~% ssh-keygen -t rsa +Generating public/private rsa key pair. +Enter file in which to save the key (/home/hi684/.ssh/id_rsa): +Created directory '/home/hi684/.ssh'. +Enter passphrase (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in /home/hi684/.ssh/id_rsa. +Your public key has been saved in /home/hi684/.ssh/id_rsa.pub. +The key fingerprint is: +SHA256:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx hi684@account-vm +The key's randomart image is: ++---[RSA 2048]----+ +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| +|xxxxxxxxxxxxxxxxx| ++----[SHA256]-----+ +hi684@account-vm ~% ls -hla .ssh +total 16K +drwx------. 2 hi684 hi684 4.0K Nov 26 16:37 . +drwx------. 7 hi684 hi684 4.0K Nov 26 16:37 .. +-rw-------. 1 hi684 hi684 1.8K Nov 26 16:37 id_rsa +-rw-r--r--. 1 hi684 hi684 398 Nov 26 16:37 id_rsa.pub +``` + +## 3.2 根据需求选择yaml + +每位用户家目录下面都存放了一个lkp-tests的文件夹 + +```shell +hi684@account-vm ~% cd lkp-tests/jobs +hi684@account-vm ~/lkp-tests/jobs% ls -hl borrow-* +-rw-r--r--. 1 root root 53 Nov 2 14:54 borrow-10d.yaml +-rw-r--r--. 1 root root 64 Nov 2 14:54 borrow-1d.yaml +-rw-r--r--. 1 root root 235 Nov 19 15:27 borrow-1h.yaml +``` + +## 3.3 提交yaml并连接测试机（物理机） + +```shell +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=taishan200-2280-2s64p-256g borrow-1h.yaml +2020-11-26 14:49:13 +0800 WARN -- skip non-executable /home/hi684/lkp-tests/monitors/plain/wait +submit borrow-1h.yaml, got job_id=z9.170594 +query=>{"job_id":["z9.170594"]} +connect to ws://172.168.131.2:11310/filter +{"job_id":"z9.170594","message":"","job_state":"submit","result_root":"/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594"} +{"job_id": "z9.170594", "result_root": "/srv/result/borrow/2020-11-26/taishan200-2280-2s64p-256g/openeuler-20.03-aarch64/3600/z9.170594", "job_state": "set result root"} +{"job_id": "z9.170594", "job_state": "boot"} +{"job_id": "z9.170594", "job_state": "download"} +{"time":"2020-11-26 14:51:56","mac":"84-46-fe-26-d3-47","ip":"172.168.178.48","job_id":"z9.170594","state":"running","testbox":"taishan200-2280-2s64p-256g--a5"} +{"job_state":"running","job_id":"z9.170594"} +{"job_id": "z9.170594", "state": "set ssh port", "ssh_port": "50420", "tbox_name": "taishan200-2280-2s64p-256g--a5"} +Host 172.168.131.2 not found in /home/hi684/.ssh/known_hosts +Warning: Permanently added '[172.168.131.2]:50420' (ECDSA) to the list of known hosts. +Last login: Wed Sep 23 11:10:58 2020 + + +Welcome to 4.19.90-2003.4.0.0036.oe1.aarch64 + +System information as of time: Thu Nov 26 14:51:59 CST 2020 + +System load: 1.31 +Processes: 1020 +Memory used: 5.1% +Swap used: 0.0% +Usage On: 3% +IP address: 172.168.178.48 +Users online: 1 + + + +root@taishan200-2280-2s64p-256g--a5 ~# +``` + +更多关于`submit命令如何使用`、`testbox都有什么可选项`、`如何borrow指定的操作系统`，请参见文章末尾Faq。 + +## 3.4 使用完毕退还测试机（物理机） + +```shell +root@taishan200-2280-2s64p-256g--a5 ~# reboot +Connection to 172.168.131.2 closed by remote host. +Connection to 172.168.131.2 closed. +hi684@account-vm ~/lkp-tests/jobs% +``` + + +# 4 Faq +------- + +## 4.1 如何自行修改申请时长？ + +```shell +hi684@account-vm ~/lkp-tests/jobs% cat borrow-1h.yaml +suite: borrow +testcase: borrow + +sshd: + pub_key: <%= + begin + File.read("#{ENV['HOME']}/.ssh/id_rsa.pub").chomp + rescue + nil + end + %> +# sleep at the bottom +sleep: 1h +hi684@account-vm ~/lkp-tests/jobs% grep sleep: borrow-1h.yaml +sleep: 1h +# 使用vim来修改你的sleep字段的值 +hi684@account-vm ~/lkp-tests/jobs% vim borrow-1h.yaml +# 修改完毕后重新submit即可 +hi684@account-vm ~/lkp-tests/jobs% submit -c -m testbox=vm-2p8g borrow-1h.yaml +``` + +## 4.2 Submit命令指导 + +参考文档：[compass-ci测试平台使用教程--submit命令详解.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/compass-ci测试平台使用教程--submit命令详解.md) + +## 4.3 testbox都有什么可选项？ + +testbox可选项见：https://gitee.com/wu_fengguang/lab-z9/tree/master/hosts + +> 说明： +> 虚拟机的testbox: +> - vm-xxx +> +> 物理机的testbox: +> - taishan200-2280-xxx + + +> 注意： +> - 物理机的testbox若选择以`--axx`结尾的，则表示指定到了具体的某一个物理机。若此物理机任务队列中已经有任务在排队，则需要等待队列中前面的任务执行完毕后，才会轮到你提交的borrow任务。 +> - 物理机的testbox若不选择以`-axx`结尾的，表示不指定具体的某一个物理机。则此时集群中的空闲物理机会即时被分配执行你的borrow任务。 + +## 4.4 如何borrow指定的操作系统？ + +关于支持的`os`, `os_arch`, `os_version`，参见：[os-os_verison-os_arch.md](https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/job/os-os_verison-os_arch.md) -- 2.23.0

1 0

[PATCH compass-ci] doc/manual: update how-to-create-a-PKGBUILD.md
by Liu Shaofei 26 Nov '20

26 Nov '20

Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- ...75\225\347\274\226\345\206\231PKGBUILD.md" | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 "doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" diff --git "a/doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" "b/doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" new file mode 100644 index 0000000..d94b113 --- /dev/null +++ "b/doc/manual/\345\246\202\344\275\225\347\274\226\345\206\231PKGBUILD.md" @@ -0,0 +1,83 @@ +# PKGBUILD�� +----------------- + +PKGBUILD��shell��makepkg��PKGBUILD�� + +# PKGBUILD�� +------------------- + +PKGBUILD�� + +## �� + +- pkgname: ��; +- pkgver: �� +- pkgrel: �� +- arch: �� +- depends: �� +- makedepends: �� +- source: ��MD5�� + +## �� + +- package�� + package�� +- prepare�� + ��prepare�� +- build�� + ��build��/�� +- check�� + ��check�� + +> �� +> srcdir �� pkgdir +> - srcdir: ��srcdir�� +> - pkgdir: ��package�� + +# ��PKGBUILD�� +------------------- + +## ��PKGBUILD��PKGBUILD�� + +`touch PKGBUILD` + +## ��vim��PKGBUILD��PKGBUILD�� + +��PKGBUILD�� + +```shell +pkgname=zstd +pkgver=1.4.4 +pkgrel=2 +arch=('i686' 'x86_64' 'aarch64') +url='https://github.com/facebook/zstd' +license=('custom:BSD3' 'GPL2') +depends=('xz' 'zlib' 'lz4') +makedepends=('git') +source=('git://github.com/facebook/zstd.git#branch=dev') +md5sums=('SKIP') + +pkgver() { + cd "$srcdir/$pkgname" + git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g;s/^v//g' +} + +build() { + cd "$srcdir/$pkgname" + make + make -C contrib/pzstd +} + +package() { + cd "$srcdir/$pkgname" + make PREFIX="/usr" DESTDIR="$pkgdir/" install + install -D -m755 contrib/pzstd/pzstd "$pkgdir/usr/bin/pzstd" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +``` + +# �� +------ + +- [PKGBUILD(5) Manual Page](https://www.archlinux.org/pacman/PKGBUILD.5.html) +- [pkgbuild demo��](https://git.archlinux.org/pacman.git/plain/proto/PKGBUILD.proto) -- 2.23.0

1 0

[PATCH v4 compass-ci] doc: update apply-ssh-account.md
by Luan Shengde 26 Nov '20

26 Nov '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- doc/manual/apply-ssh-account.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manual/apply-ssh-account.md b/doc/manual/apply-ssh-account.md index 9040516..160657e 100644 --- a/doc/manual/apply-ssh-account.md +++ b/doc/manual/apply-ssh-account.md @@ -35,4 +35,4 @@ ~/.config/compass-ci/default/account.yaml for more information: how to use submit - https://gitee.com/openeuler/compass-ci/blob/master/doc/compass-ci测试平台使用教程--… + https://gitee.com/wu_fengguang/compass-ci/blob/master/doc/manual/compass-ci… -- 2.23.0

1 0

[PATCH v3 compass-ci] doc: update apply-ssh-account.md
by Luan Shengde 26 Nov '20

26 Nov '20

Signed-off-by: Luan Shengde <shdluan(a)163.com> --- doc/{ => manual}/apply-ssh-account.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{ => manual}/apply-ssh-account.md (100%) diff --git a/doc/apply-ssh-account.md b/doc/manual/apply-ssh-account.md similarity index 100% rename from doc/apply-ssh-account.md rename to doc/manual/apply-ssh-account.md -- 2.23.0

1 0

[PATCH v3 compass-ci] doc/manual: how to check the result files
by Wei Jihui 26 Nov '20

26 Nov '20

Signed-off-by: Wei Jihui <weijihuiall(a)163.com> --- ...\273\273\345\212\241\347\273\223\346\236\234" | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 "doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" diff --git "a/doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" "b/doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" new file mode 100644 index 0000000..7a8cf8b --- /dev/null +++ "b/doc/manual/\345\246\202\344\275\225\346\237\245\347\234\213\344\273\273\345\212\241\347\273\223\346\236\234" @@ -0,0 +1,16 @@ +# 如何查看任务结果 + 测试用例执行完成后，可以登录到https://compass-ci.openeuler.org/jobs查看用例的结果。 + 在网站上找到自己的任务，可以根据提交时定义的suite或者提交任务返回的id来搜索和确认是哪一个任务，点击任务对应的job state列即可查看。 + +# 下面介绍compass-ci生成的几个比较重要的结果文件 +## job.yaml文件 + job.yaml文件中部分字段是用户提交上来的，还有一部分字段是根据提交的job自动添加进来。 + 此文件包含了测试任务需要的所有参数。 + +## output文件 + output文件记录了用例的执行过程，文件最后部分一般会有check_exit_code这个状态码，非0时代表测试用例错误。 + +## stats.json文件 + 测试用例完成会生成一个与测试用例同名的文件，记录它们的测试命令及标准化输出结果。 + compass-ci会对这些文件进行解析，生成后缀名是.json的文件。 + stats.json是所有的json文件的汇总，也就是所有测试命令的关键结果都会统计到这个文件中，便于后续的比较和分析。 -- 2.23.0

1 0

[PATCH compass-ci] doc: update how-to-create-a-PKGBUILD.md
by Liu Shaofei 26 Nov '20

26 Nov '20

Signed-off-by: Liu Shaofei <liushaofei5(a)huawei.com> --- doc/how-to-create-a-PKGBUILD.md | 162 ++++++++++++++++---------------- 1 file changed, 83 insertions(+), 79 deletions(-) diff --git a/doc/how-to-create-a-PKGBUILD.md b/doc/how-to-create-a-PKGBUILD.md index 01e1084..d94b113 100644 --- a/doc/how-to-create-a-PKGBUILD.md +++ b/doc/how-to-create-a-PKGBUILD.md @@ -1,79 +1,83 @@ -# ��PKGBUILD - -## PKGBUILD�� - - PKGBUILD��shell��makepkg��PKGBUILD�� - -## PKGBUILD�� - - PKGBUILD�� - - 1�� - - - pkgname: ��; - - pkgver: �� - - pkgrel: �� - - arch: �� - - depends: �� - - makedepends: �� - - source: ��MD5�� - - 2�� - - - package�� - package�� - - prepare�� - ��prepare�� - - build�� - ��build��/�� - - check�� - ��check�� - - ��srcdir �� pkgdir - - - srcdir: ��srcdir�� - - pkgdir: ��package�� - -## ��PKGBUILD�� - - 1��PKGBUILD��PKGBUILD�� - - `touch PKGBUILD` - - 2��vim��PKGBUILD��PKGBUILD�� - - ��PKGBUILD�� - - pkgname=zstd - pkgver=1.4.4 - pkgrel=2 - arch=('i686' 'x86_64' 'aarch64') - url='https://github.com/facebook/zstd' - license=('custom:BSD3' 'GPL2') - depends=('xz' 'zlib' 'lz4') - makedepends=('git') - source=('git://github.com/facebook/zstd.git#branch=dev') - md5sums=('SKIP') - - pkgver() { - cd "$srcdir/$pkgname" - git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g;s/^v//g' - } - - build() { - cd "$srcdir/$pkgname" - make - make -C contrib/pzstd - } - - package() { - cd "$srcdir/$pkgname" - make PREFIX="/usr" DESTDIR="$pkgdir/" install - install -D -m755 contrib/pzstd/pzstd "$pkgdir/usr/bin/pzstd" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - } - -## �� - - https://www.archlinux.org/pacman/PKGBUILD.5.html - https://git.archlinux.org/pacman.git/plain/proto/PKGBUILD.proto +# PKGBUILD�� +----------------- + +PKGBUILD��shell��makepkg��PKGBUILD�� + +# PKGBUILD�� +------------------- + +PKGBUILD�� + +## �� + +- pkgname: ��; +- pkgver: �� +- pkgrel: �� +- arch: �� +- depends: �� +- makedepends: �� +- source: ��MD5�� + +## �� + +- package�� + package�� +- prepare�� + ��prepare�� +- build�� + ��build��/�� +- check�� + ��check�� + +> �� +> srcdir �� pkgdir +> - srcdir: ��srcdir�� +> - pkgdir: ��package�� + +# ��PKGBUILD�� +------------------- + +## ��PKGBUILD��PKGBUILD�� + +`touch PKGBUILD` + +## ��vim��PKGBUILD��PKGBUILD�� + +��PKGBUILD�� + +```shell +pkgname=zstd +pkgver=1.4.4 +pkgrel=2 +arch=('i686' 'x86_64' 'aarch64') +url='https://github.com/facebook/zstd' +license=('custom:BSD3' 'GPL2') +depends=('xz' 'zlib' 'lz4') +makedepends=('git') +source=('git://github.com/facebook/zstd.git#branch=dev') +md5sums=('SKIP') + +pkgver() { + cd "$srcdir/$pkgname" + git describe --long --tags | sed 's/$[^-]*-g$/r\1/;s/-/./g;s/^v//g' +} + +build() { + cd "$srcdir/$pkgname" + make + make -C contrib/pzstd +} + +package() { + cd "$srcdir/$pkgname" + make PREFIX="/usr" DESTDIR="$pkgdir/" install + install -D -m755 contrib/pzstd/pzstd "$pkgdir/usr/bin/pzstd" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +``` + +# �� +------ + +- [PKGBUILD(5) Manual Page](https://www.archlinux.org/pacman/PKGBUILD.5.html) +- [pkgbuild demo��](https://git.archlinux.org/pacman.git/plain/proto/PKGBUILD.proto) -- 2.23.0

1 0

[PATCH v4 compass-ci] doc/manual: add a document for adding open source project
by Li Yuanchao 26 Nov '20

26 Nov '20

Signed-off-by: Li Yuanchao <lyc163mail(a)163.com> --- ...-compass-ci-to-test-open-source-project.md | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 doc/manual/how-to-use-compass-ci-to-test-open-source-project.md diff --git a/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md b/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md new file mode 100644 index 0000000..ad4f9b0 --- /dev/null +++ b/doc/manual/how-to-use-compass-ci-to-test-open-source-project.md @@ -0,0 +1,53 @@ +使用compass-ci平台测试开源仓库，需要完成 +1. 将仓库url添加到upstream-repos仓库中 +2. 添加自己的测试case + +### 首先，将想要测试的代码仓信息以yaml格式文件的形式添加到upstream-repos仓库 + +仓库地址为：https://gitee.com/wu_fengguang/upstream-repos + +你可以先fork这个仓库，新建文件之后，通过Pull Request的方式完成添加。 + +以仓库backlight为例： + +它的url为：https://github.com/baskerville/backlight +1. 以首字母和仓库名创建路径 +``` +mkdir -p b/backlight +``` +2. 在该目录下新建同名文件backlight： +``` +cd b/backlight +touch backlight +``` +3. 使用vim写入url： +``` +vim backlight +``` +内容格式为 +``` +--- +url: +- https://github.com/baskerville/backlight +``` +请保持格式一致，若不确定，可参考upstream-repos仓库中已有文件。 + +### 然后，将测试case以yaml文件的形式添加到lkp-tests仓库的jobs目录 + +仓库地址为 https://gitee.com/wu_fengguang/lkp-tests + +这其中有一些已经适配好的测试case，如果你想要测试的case其中正好有，那就可以直接使用。使用方式以iperf为例。 + +iperf是已经适配的一个测试case，在lkp-tests仓库的jobs下有一个iperf.yaml文件，里面有一些测试的基本参数。 + +然后，你要在compass-ci仓库下面的 sbin/auto_submit.yaml 文件中添加 +``` +b/backlight/backlight: +- testbox=vm-2p8g os=openEuler os_version=20.03 os_mount=initramfs os_arch=aarch64 iperf.yaml +``` +并通过Pull Request的方式提交。相关参数含义见参考文档 + +参考文档： +- [compass-ci测试平台使用教程--submit命令详解](https://gitee.com/wu_fengguang/compass-ci/t… +- [如何适配测试用例](https://gitee.com/wu_fengguang/lkp-tests/blob/master/doc/add-test… + -- 2.23.0

1 0