Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
feat(infra): Remove 2n-skx/3n-snx leftovers
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
common.sh
diff --git
a/resources/libraries/bash/function/common.sh
b/resources/libraries/bash/function/common.sh
index
dac4521
..
228be2b
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-118,7
+118,7
@@
function activate_virtualenv () {
env_dir="${root_path}/env"
req_path=${2-$CSIT_DIR/requirements.txt}
rm -rf "${env_dir}" || die "Failed to clean previous virtualenv."
env_dir="${root_path}/env"
req_path=${2-$CSIT_DIR/requirements.txt}
rm -rf "${env_dir}" || die "Failed to clean previous virtualenv."
- pip3 install virtualenv==20.
0.20
|| {
+ pip3 install virtualenv==20.
15.1
|| {
die "Virtualenv package install failed."
}
virtualenv --no-download --python=$(which python3) "${env_dir}" || {
die "Virtualenv package install failed."
}
virtualenv --no-download --python=$(which python3) "${env_dir}" || {
@@
-455,14
+455,6
@@
function get_test_code () {
NODENESS="3n"
FLAVOR="aws"
;;
NODENESS="3n"
FLAVOR="aws"
;;
- *"2n-skx"*)
- NODENESS="2n"
- FLAVOR="skx"
- ;;
- *"3n-skx"*)
- NODENESS="3n"
- FLAVOR="skx"
- ;;
*"2n-zn2"*)
NODENESS="2n"
FLAVOR="zn2"
*"2n-zn2"*)
NODENESS="2n"
FLAVOR="zn2"
@@
-779,7
+771,6
@@
function run_pybot () {
set -exuo pipefail
all_options=("--outputdir" "${ARCHIVE_DIR}" "${PYBOT_ARGS[@]}")
set -exuo pipefail
all_options=("--outputdir" "${ARCHIVE_DIR}" "${PYBOT_ARGS[@]}")
- all_options+=("--noncritical" "EXPECTED_FAILING")
all_options+=("${EXPANDED_TAGS[@]}")
pushd "${CSIT_DIR}" || die "Change directory operation failed."
all_options+=("${EXPANDED_TAGS[@]}")
pushd "${CSIT_DIR}" || die "Change directory operation failed."
@@
-884,7
+875,7
@@
function select_tags () {
default_nic="nic_intel-x553"
;;
*"3n-snr"*)
default_nic="nic_intel-x553"
;;
*"3n-snr"*)
- default_nic="nic_intel-e8
10xxv
"
+ default_nic="nic_intel-e8
22cq
"
;;
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
@@
-892,7
+883,7
@@
function select_tags () {
*"3n-icx"* | *"2n-icx"*)
default_nic="nic_intel-xxv710"
;;
*"3n-icx"* | *"2n-icx"*)
default_nic="nic_intel-xxv710"
;;
- *"
3n-skx"* | *"2n-skx"* | *"
2n-clx"* | *"2n-zn2"*)
+ *"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
*"2n-tx2"* | *"3n-alt"* | *"mrr-daily-master")
default_nic="nic_intel-xxv710"
;;
*"2n-tx2"* | *"3n-alt"* | *"mrr-daily-master")
@@
-1002,14
+993,6
@@
function select_tags () {
*"1n_tx2"*)
test_tag_array+=("!flow")
;;
*"1n_tx2"*)
test_tag_array+=("!flow")
;;
- *"2n-skx"*)
- test_tag_array+=("!ipsechw")
- ;;
- *"3n-skx"*)
- test_tag_array+=("!ipsechw")
- # Not enough nic_intel-xxv710 to support double link tests.
- test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
- ;;
*"2n-clx"*)
test_tag_array+=("!ipsechw")
;;
*"2n-clx"*)
test_tag_array+=("!ipsechw")
;;
@@
-1155,6
+1138,10
@@
function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_dnv*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_dnv*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
+ "3n_snr")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr*.yaml )
+ TOPOLOGIES_TAGS="3_node_single_link_topo"
+ ;;
"3n_tsh")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
"3n_tsh")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"