[PATCH v3 compass-ci] obtain the queues parameter from CLI

Usage: multi-docker -n -c -q -n, --name HOSTNAME_PREFIX format: $tbox_group.$HOSTNAME -c, --count count how many containers do you need -q, --queues queues separated by "," -h, --help show this message Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/multi-docker | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/providers/multi-docker b/providers/multi-docker index 64cafaa..ceaeea5 100755 --- a/providers/multi-docker +++ b/providers/multi-docker @@ -9,17 +9,21 @@ require_relative './docker/docker' opt = {} options = OptionParser.new do |opts| - opts.banner = 'Usage: multi-qemu [-t] [-n]' + opts.banner = 'Usage: multi-docker -n -c -q' opts.separator '' - opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'specify used hostname_prefix') do |name| + opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'format: $tbox_group.$HOSTNAME') do |name| opt['hostname_prefix'] = name end - opts.on('-c count', '--count count', 'how much container do you need') do |num| + opts.on('-c count', '--count count', 'how many containers do you need') do |num| opt['nr_container'] = num end + opts.on('-q queues', '--queues queues', 'separated by ","') do |queues| + opt['queues'] = queues + end + opts.on_tail('-h', '--help', 'show this message') do puts opts exit @@ -28,13 +32,14 @@ end if ARGV.size.zero? puts options - exit + exit 1 end options.parse!(ARGV) -hostname = opt['hostname_prefix'] || 'dc-1g' +hostname = opt['hostname_prefix'] || "dc-1g.#{ENV['HOSTNAME']}" nr_container = opt['nr_container'] || 1 +queues = opt['queues'] || "dc-1g.#{ENV['HOSTNAME']}" -pids = multi_docker(hostname, nr_container) +pids = multi_docker(hostname, nr_container, queues) save_pid pids -- 2.23.0

Reviewed-by: Wang Chenglong <18509160991@163.com> On Thu, Nov 12, 2020 at 11:50:14AM +0800, Xiao Shenwei wrote:
Usage: multi-docker -n -c -q -n, --name HOSTNAME_PREFIX format: $tbox_group.$HOSTNAME -c, --count count how many containers do you need -q, --queues queues separated by "," -h, --help show this message
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/multi-docker | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/providers/multi-docker b/providers/multi-docker index 64cafaa..ceaeea5 100755 --- a/providers/multi-docker +++ b/providers/multi-docker @@ -9,17 +9,21 @@ require_relative './docker/docker' opt = {}
options = OptionParser.new do |opts| - opts.banner = 'Usage: multi-qemu [-t] [-n]' + opts.banner = 'Usage: multi-docker -n -c -q'
opts.separator '' - opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'specify used hostname_prefix') do |name| + opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'format: $tbox_group.$HOSTNAME') do |name| opt['hostname_prefix'] = name end
- opts.on('-c count', '--count count', 'how much container do you need') do |num| + opts.on('-c count', '--count count', 'how many containers do you need') do |num| opt['nr_container'] = num end
+ opts.on('-q queues', '--queues queues', 'separated by ","') do |queues| + opt['queues'] = queues + end + opts.on_tail('-h', '--help', 'show this message') do puts opts exit @@ -28,13 +32,14 @@ end
if ARGV.size.zero? puts options - exit + exit 1 end
options.parse!(ARGV)
-hostname = opt['hostname_prefix'] || 'dc-1g' +hostname = opt['hostname_prefix'] || "dc-1g.#{ENV['HOSTNAME']}" nr_container = opt['nr_container'] || 1 +queues = opt['queues'] || "dc-1g.#{ENV['HOSTNAME']}"
-pids = multi_docker(hostname, nr_container) +pids = multi_docker(hostname, nr_container, queues) save_pid pids -- 2.23.0

On Thu, Nov 12, 2020 at 11:50:14AM +0800, Xiao Shenwei wrote:
Usage: multi-docker -n -c -q -n, --name HOSTNAME_PREFIX format: $tbox_group.$HOSTNAME -c, --count count how many containers do you need -q, --queues queues separated by "," -h, --help show this message
If there is no value in these three params, do these vars have default values? Have you considered this situation? -------- Thanks Yu Chuan
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/multi-docker | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/providers/multi-docker b/providers/multi-docker index 64cafaa..ceaeea5 100755 --- a/providers/multi-docker +++ b/providers/multi-docker @@ -9,17 +9,21 @@ require_relative './docker/docker' opt = {}
options = OptionParser.new do |opts| - opts.banner = 'Usage: multi-qemu [-t] [-n]' + opts.banner = 'Usage: multi-docker -n -c -q'
opts.separator '' - opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'specify used hostname_prefix') do |name| + opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'format: $tbox_group.$HOSTNAME') do |name| opt['hostname_prefix'] = name end
- opts.on('-c count', '--count count', 'how much container do you need') do |num| + opts.on('-c count', '--count count', 'how many containers do you need') do |num| opt['nr_container'] = num end
+ opts.on('-q queues', '--queues queues', 'separated by ","') do |queues| + opt['queues'] = queues + end + opts.on_tail('-h', '--help', 'show this message') do puts opts exit @@ -28,13 +32,14 @@ end
if ARGV.size.zero? puts options - exit + exit 1 end
options.parse!(ARGV)
-hostname = opt['hostname_prefix'] || 'dc-1g' +hostname = opt['hostname_prefix'] || "dc-1g.#{ENV['HOSTNAME']}" nr_container = opt['nr_container'] || 1 +queues = opt['queues'] || "dc-1g.#{ENV['HOSTNAME']}"
-pids = multi_docker(hostname, nr_container) +pids = multi_docker(hostname, nr_container, queues) save_pid pids -- 2.23.0

On Thu, Nov 12, 2020 at 03:15:42PM +0800, Yu Chuan wrote:
On Thu, Nov 12, 2020 at 11:50:14AM +0800, Xiao Shenwei wrote:
Usage: multi-docker -n -c -q -n, --name HOSTNAME_PREFIX format: $tbox_group.$HOSTNAME -c, --count count how many containers do you need -q, --queues queues separated by "," -h, --help show this message
If there is no value in these three params, do these vars have default values? Have you considered this situation?
yes
if ARGV.size.zero? puts options - exit + exit 1
at least one
end
options.parse!(ARGV)
-hostname = opt['hostname_prefix'] || 'dc-1g' +hostname = opt['hostname_prefix'] || "dc-1g.#{ENV['HOSTNAME']}" nr_container = opt['nr_container'] || 1
default value Thanks, Shenwei
+queues = opt['queues'] || "dc-1g.#{ENV['HOSTNAME']}"
-pids = multi_docker(hostname, nr_container) +pids = multi_docker(hostname, nr_container, queues) save_pid pids -- 2.23.0
participants (3)
-
Wang Chenglong
-
Xiao Shenwei
-
Yu Chuan