Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
refactor(terraform): 2n_aws_c5n
[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
49b60ad
..
7595f17
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-1,5
+1,5
@@
-# Copyright (c) 202
1
Cisco and/or its affiliates.
-# Copyright (c) 202
1
PANTHEON.tech and/or its affiliates.
+# Copyright (c) 202
2
Cisco and/or its affiliates.
+# Copyright (c) 202
2
PANTHEON.tech 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:
# 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:
@@
-137,20
+137,19
@@
function activate_virtualenv () {
function archive_tests () {
function archive_tests () {
- # Create .tar.
x
z of generated/tests for archiving.
+ # Create .tar.
g
z of generated/tests for archiving.
# To be run after generate_tests, kept separate to offer more flexibility.
# Directory read:
# - ${GENERATED_DIR}/tests - Tree of executed suites to archive.
# File rewriten:
# To be run after generate_tests, kept separate to offer more flexibility.
# Directory read:
# - ${GENERATED_DIR}/tests - Tree of executed suites to archive.
# File rewriten:
- # - ${ARCHIVE_DIR}/
tests.tar.x
z - Archive of generated tests.
+ # - ${ARCHIVE_DIR}/
generated_tests.tar.g
z - Archive of generated tests.
set -exuo pipefail
set -exuo pipefail
- filename="generated_robot_files.tar.xz"
- tar c "${GENERATED_DIR}/tests" | xz -3 > "${ARCHIVE_DIR}/${filename}" || {
- die "Error creating archive of generated tests."
- }
+ pushd "${ARCHIVE_DIR}" || die
+ tar czf "generated_tests.tar.gz" "${GENERATED_DIR}/tests" || true
+ popd || die
}
}
@@
-456,18
+455,26
@@
function get_test_code () {
NODENESS="2n"
FLAVOR="skx"
;;
NODENESS="2n"
FLAVOR="skx"
;;
- *"2n-zn2"*)
- NODENESS="2n"
- FLAVOR="zn2"
- ;;
*"3n-skx"*)
NODENESS="3n"
FLAVOR="skx"
;;
*"3n-skx"*)
NODENESS="3n"
FLAVOR="skx"
;;
+ *"2n-zn2"*)
+ NODENESS="2n"
+ FLAVOR="zn2"
+ ;;
*"2n-clx"*)
NODENESS="2n"
FLAVOR="clx"
;;
*"2n-clx"*)
NODENESS="2n"
FLAVOR="clx"
;;
+ *"2n-icx"*)
+ NODENESS="2n"
+ FLAVOR="icx"
+ ;;
+ *"3n-icx"*)
+ NODENESS="3n"
+ FLAVOR="icx"
+ ;;
*"2n-dnv"*)
NODENESS="2n"
FLAVOR="dnv"
*"2n-dnv"*)
NODENESS="2n"
FLAVOR="dnv"
@@
-620,7
+627,7
@@
function post_process_robot_outputs () {
# We are keeping info outputs where they are.
# Assuming we want to move anything but info files (and dirs).
options+=("--exclude=*.info.json")
# We are keeping info outputs where they are.
# Assuming we want to move anything but info files (and dirs).
options+=("--exclude=*.info.json")
- tar cz
vf "tests
_output_raw.tar.gz" "${options[@]}" "tests" || true
+ tar cz
f "generated
_output_raw.tar.gz" "${options[@]}" "tests" || true
# Tar can remove when archiving, but chokes (not deterministically)
# on attempting to remove dirs (not empty as info files are there).
# So we need to delete the raw files manually.
# Tar can remove when archiving, but chokes (not deterministically)
# on attempting to remove dirs (not empty as info files are there).
# So we need to delete the raw files manually.
@@
-865,6
+872,9
@@
function select_tags () {
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
+ *"3n-icx"* | *"2n-icx"*)
+ default_nic="nic_intel-xxv710"
+ ;;
*"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
*"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
@@
-986,6
+996,14
@@
function select_tags () {
*"2n-clx"*)
test_tag_array+=("!ipsechw")
;;
*"2n-clx"*)
test_tag_array+=("!ipsechw")
;;
+ *"2n-icx"*)
+ test_tag_array+=("!ipsechw")
+ ;;
+ *"3n-icx"*)
+ 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-zn2"*)
test_tag_array+=("!ipsechw")
;;
*"2n-zn2"*)
test_tag_array+=("!ipsechw")
;;
@@
-1098,10
+1116,18
@@
function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
;;
+ "3n_icx")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_icx*.yaml )
+ TOPOLOGIES_TAGS="3_node_*_link_topo"
+ ;;
"2n_clx")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
"2n_clx")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_clx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
+ "2n_icx")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
+ TOPOLOGIES_TAGS="2_node_*_link_topo"
+ ;;
"2n_dnv")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
"2n_dnv")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_dnv*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
@@
-1119,11
+1145,11
@@
function select_topology () {
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"2n_aws")
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"2n_aws")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n
_
aws*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n
-
aws*.yaml )
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"3n_aws")
TOPOLOGIES_TAGS="2_node_single_link_topo"
;;
"3n_aws")
- TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n
_
aws*.yaml )
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n
-
aws*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
*)
TOPOLOGIES_TAGS="3_node_single_link_topo"
;;
*)