[Compass-ci] Re: [PATCH compass-ci] params_group.rb: delete $user if tbox_group has

On Tue, Dec 01, 2020 at 11:35:24AM +0800, Luan Shengde wrote:

On Tue, Dec 01, 2020 at 10:53:29AM +0800, Li Yuanchao wrote:

...

Some tbox_groups have $user in es. Such as vm-2p8g--$user or vm-2p8g.$user. But their config is the same, they should be compared together.

Signed-off-by: Li Yuanchao lyc163mail@163.com

lib/params_group.rb | 7 +++++++ 1 file changed, 7 insertions(+)

diff --git a/lib/params_group.rb b/lib/params_group.rb index cde40af..6d5c47b 100644 --- a/lib/params_group.rb +++ b/lib/params_group.rb @@ -67,10 +67,17 @@ def filter_groups(groups) end end

+def get_tbox_group(tbox_group)

• tbox_group = tbox_group.split('--')[0] if tbox_group.include?('--')
• tbox_group = tbox_group.split('.')[0] if tbox_group.include?('.')
• return tbox_group

you can use gsub to replace the "--.*$" and "..*$" to '' example: tbox_group.gsub(/(--|.).*$/, '') and you can merge the three line to one

ok

Thanks, Yuanchao