Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vpp_device: fix shim hostname
[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
70ce91c
..
2b1a7f5
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-42,7
+42,6
@@
function activate_docker_topology () {
source "${BASH_FUNCTION_DIR}/device.sh" || {
die "Source failed!"
}
source "${BASH_FUNCTION_DIR}/device.sh" || {
die "Source failed!"
}
-
device_image="$(< ${CSIT_DIR}/${IMAGE_VER_FILE})"
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
device_image="$(< ${CSIT_DIR}/${IMAGE_VER_FILE})"
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
@@
-50,8
+49,9
@@
function activate_docker_topology () {
# We execute reservation over csit-shim-dcr (ssh) which runs sourced
# script's functions. Env variables are read from ssh output
# back to localhost for further processing.
# We execute reservation over csit-shim-dcr (ssh) which runs sourced
# script's functions. Env variables are read from ssh output
# back to localhost for further processing.
- hostname=$(grep search /etc/resolv.conf | cut -d' ' -f3) || die
- ssh="ssh root@${hostname} -p 6022"
+ # Shim and Jenkins executor are in the same network on the same host
+ # Connect to docker's default gateway IP and shim's exposed port
+ ssh="ssh root@172.17.0.1 -p 6022"
run="activate_wrapper ${NODENESS} ${FLAVOR} ${device_image}"
# The "declare -f" output is long and boring.
set +x
run="activate_wrapper ${NODENESS} ${FLAVOR} ${device_image}"
# The "declare -f" output is long and boring.
set +x
@@
-333,8
+333,7
@@
function deactivate_docker_topology () {
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
"1n_skx" | "1n_tx2")
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
"1n_skx" | "1n_tx2")
- hostname=$(grep search /etc/resolv.conf | cut -d' ' -f3) || die
- ssh="ssh root@${hostname} -p 6022"
+ ssh="ssh root@172.17.0.1 -p 6022"
env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die
# The "declare -f" output is long and boring.
set +x
env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die
# The "declare -f" output is long and boring.
set +x
@@
-461,6
+460,10
@@
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"
@@
-757,7
+760,7
@@
function select_tags () {
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
*"3n-tsh"*)
default_nic="nic_intel-x520-da2"
;;
- *"3n-skx"* | *"2n-skx"* | *"2n-clx"*)
+ *"3n-skx"* | *"2n-skx"* | *"2n-clx"*
| *"2n-zn2"*
)
default_nic="nic_intel-xxv710"
;;
*"3n-hsw"* | *"mrr-daily-master")
default_nic="nic_intel-xxv710"
;;
*"3n-hsw"* | *"mrr-daily-master")
@@
-784,17
+787,17
@@
function select_tags () {
*"ndrpdr-weekly"* )
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/mlr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
*"ndrpdr-weekly"* )
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/mlr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
- eval ${sed_nics_sub_cmd}) || die
+ eval ${sed_nics_sub_cmd}
|| echo "perftest"
) || die
;;
*"mrr-daily"* )
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/mrr_daily/${DUT}-${NODENESS}-${FLAVOR}.md |
;;
*"mrr-daily"* )
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/mrr_daily/${DUT}-${NODENESS}-${FLAVOR}.md |
- eval ${sed_nics_sub_cmd}) || die
+ eval ${sed_nics_sub_cmd}
|| echo "perftest"
) || die
;;
*"mrr-weekly"* )
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/mrr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
;;
*"mrr-weekly"* )
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/mrr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
- eval ${sed_nics_sub_cmd}) || die
+ eval ${sed_nics_sub_cmd}
|| echo "perftest"
) || die
;;
*"report-iterative"* )
test_sets=(${TEST_TAG_STRING//:/ })
;;
*"report-iterative"* )
test_sets=(${TEST_TAG_STRING//:/ })
@@
-802,7
+805,7
@@
function select_tags () {
report_file=${test_sets[0]}.md
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/report_iterative/${NODENESS}-${FLAVOR}/${report_file} |
report_file=${test_sets[0]}.md
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/report_iterative/${NODENESS}-${FLAVOR}/${report_file} |
- eval ${sed_nics_sub_cmd}) || die
+ eval ${sed_nics_sub_cmd}
|| echo "perftest"
) || die
;;
*"report-coverage"* )
test_sets=(${TEST_TAG_STRING//:/ })
;;
*"report-coverage"* )
test_sets=(${TEST_TAG_STRING//:/ })
@@
-810,7
+813,7
@@
function select_tags () {
report_file=${test_sets[0]}.md
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/report_coverage/${NODENESS}-${FLAVOR}/${report_file} |
report_file=${test_sets[0]}.md
readarray -t test_tag_array <<< $(sed 's/ //g' \
${tfd}/report_coverage/${NODENESS}-${FLAVOR}/${report_file} |
- eval ${sed_nics_sub_cmd}) || die
+ eval ${sed_nics_sub_cmd}
|| echo "perftest"
) || die
;;
* )
if [[ -z "${TEST_TAG_STRING-}" ]]; then
;;
* )
if [[ -z "${TEST_TAG_STRING-}" ]]; then
@@
-835,7
+838,7
@@
function select_tags () {
# TODO: Add missing reasons here (if general) or where used (if specific).
case "${TEST_CODE}" in
*"2n-skx"*)
# TODO: Add missing reasons here (if general) or where used (if specific).
case "${TEST_CODE}" in
*"2n-skx"*)
- test_tag_array+=("!ipsec
hw
")
+ test_tag_array+=("!ipsec")
;;
*"3n-skx"*)
test_tag_array+=("!ipsechw")
;;
*"3n-skx"*)
test_tag_array+=("!ipsechw")
@@
-843,7
+846,10
@@
function select_tags () {
test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
;;
*"2n-clx"*)
test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
;;
*"2n-clx"*)
- test_tag_array+=("!ipsechw")
+ test_tag_array+=("!ipsec")
+ ;;
+ *"2n-zn2"*)
+ test_tag_array+=("!ipsec")
;;
*"2n-dnv"*)
test_tag_array+=("!ipsechw")
;;
*"2n-dnv"*)
test_tag_array+=("!ipsechw")
@@
-866,10
+872,6
@@
function select_tags () {
test_tag_array+=("!ipsechw")
;;
*"3n-hsw"*)
test_tag_array+=("!ipsechw")
;;
*"3n-hsw"*)
- # TODO: Introduce NOIOMMU version of AVF tests.
- # TODO: Make (both) AVF tests work on Haswell,
- # or document why (some of) it is not possible.
- # https://github.com/FDio/vpp/blob/master/src/plugins/avf/README.md
test_tag_array+=("!drv_avf")
# All cards have access to QAT. But only one card (xl710)
# resides in same NUMA as QAT. Other cards must go over QPI
test_tag_array+=("!drv_avf")
# All cards have access to QAT. But only one card (xl710)
# resides in same NUMA as QAT. Other cards must go over QPI
@@
-959,6
+961,10
@@
function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
+ "2n_zn2")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2*.yaml )
+ TOPOLOGIES_TAGS="2_node_*_link_topo"
+ ;;
"3n_skx")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"
"3n_skx")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
TOPOLOGIES_TAGS="3_node_*_link_topo"