From be5265bc9612f5aedf4f25720c4bd8941e359410 Mon Sep 17 00:00:00 2001 From: Juraj Linkeš Date: Fri, 22 May 2020 14:25:24 +0200 Subject: Remove leading tc[nn] from test names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test names are unique without it and the information doesn't add anything extra. Change-Id: Idc7d6d1d21c8c05691e1757227a0a3787406d370 Signed-off-by: Juraj Linkeš --- resources/libraries/bash/entry/check/tc_naming.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'resources/libraries/bash/entry') diff --git a/resources/libraries/bash/entry/check/tc_naming.sh b/resources/libraries/bash/entry/check/tc_naming.sh index 2a084d9669..e9f86fc0dd 100644 --- a/resources/libraries/bash/entry/check/tc_naming.sh +++ b/resources/libraries/bash/entry/check/tc_naming.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -28,12 +28,12 @@ source "${BASH_FUNCTION_DIR}/common.sh" || { exit 1 } -# Grep of interest: We want all tc01- prefixed (skip TC variations for now). +# Grep of interest: We want all [0-9]{2,4}B- or IMIX- prefixed. # Currently script assumes all variations inside to be part of either # auto-generation or not checked at all (VIRL derivates). -r_grep="tc01-" +r_grep="([0-9]{2,4}B|IMIX)-" # Parse grep of interest (learn path, learn suite, learn testcase name). -r_parse='(.*)\/(.*).robot.*(tc[[:digit:]]{2}-.*)' +r_parse='(.*)\/(.*).robot.*(([0-9]{2,4}B|IMIX)-.*)' # CSIT Testcase naming convention rules. # https://wiki.fd.io/view/CSIT/csit-test-naming @@ -48,7 +48,6 @@ r_parse='(.*)\/(.*).robot.*(tc[[:digit:]]{2}-.*)' # One caveat of this solution is that we cannot proceed to check full names now # as majority of Testcases does not meet naming criteria. s_testc_rules=( - 'TC id' 'packet size' 'core combination' 'NIC driver mode' @@ -56,8 +55,7 @@ s_testc_rules=( 'test type' ) r_testc_rules=( - '^tc[[:digit:]]{2}-' - '([[:digit:]]{2,4}B|IMIX)-' + '^([[:digit:]]{2,4}B|IMIX)-' '([[:digit:]]+c-){0,1}' '(avf-|1lbvpplacp-|2lbvpplacp-){0,1}' '(eth|dot1q|dot1ad)' -- cgit 1.2.3-korg