X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=8e8a66367970f3644e87998eab6eed97880855a4;hp=68ad5ef92600dcc501b34c73348bcb38388e1b4f;hb=5cae594d55623cd357d02592546da00c82089f72;hpb=9c8b637ec9edcece655ac3f8413623ad59d72085 diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 68ad5ef926..8e8a663679 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. -# Copyright (c) 2021 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2022 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: @@ -86,7 +86,7 @@ function activate_docker_topology () { die "Topology file create failed!" } - WORKING_TOPOLOGY="/tmp/topology.yaml" + WORKING_TOPOLOGY="${CSIT_DIR}/topologies/available/vpp_device.yaml" mv topo.yml "${WORKING_TOPOLOGY}" || { die "Topology move failed!" } @@ -137,19 +137,19 @@ function activate_virtualenv () { function archive_tests () { - # Create .tar.xz of generated/tests for archiving. + # Create .tar.gz 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: - # - ${ARCHIVE_DIR}/tests.tar.xz - Archive of generated tests. + # - ${ARCHIVE_DIR}/generated_tests.tar.gz - Archive of generated tests. set -exuo pipefail - tar c "${GENERATED_DIR}/tests" | xz -3 > "${ARCHIVE_DIR}/tests.tar.xz" || { - die "Error creating archive of generated tests." - } + pushd "${ARCHIVE_DIR}" || die + tar czf "generated_tests.tar.gz" "${GENERATED_DIR}/tests" || true + popd || die } @@ -601,11 +601,48 @@ function move_archives () { } +function post_process_robot_outputs () { + + # Generate INFO level output_info.xml by rebot. + # Archive UTI raw json outputs. + # + # Variables read: + # - ARCHIVE_DIR - Path to post-processed files. + + set -exuo pipefail + + # Compress raw json outputs, as they will never be post-processed. + pushd "${ARCHIVE_DIR}" || die + if [ -d "tests" ]; then + # Use deterministic order. + options+=("--sort=name") + # We are keeping info outputs where they are. + # Assuming we want to move anything but info files (and dirs). + options+=("--exclude=*.info.json") + tar czf "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. + find "tests" -type f -name "*.raw.json" -delete || true + fi + popd || die + + # Generate INFO level output_info.xml for post-processing. + all_options=("--loglevel" "INFO") + all_options+=("--log" "none") + all_options+=("--report" "none") + all_options+=("--output" "${ARCHIVE_DIR}/output_info.xml") + all_options+=("${ARCHIVE_DIR}/output.xml") + rebot "${all_options[@]}" || true +} + + function prepare_topology () { # Prepare virtual testbed topology if needed based on flavor. # Variables read: + # - TEST_CODE - String affecting test selection, usually jenkins job name. # - NODENESS - Node multiplicity of testbed, either "2n" or "3n". # - FLAVOR - Node flavor string, e.g. "clx" or "skx". # Functions called: @@ -618,10 +655,12 @@ function prepare_topology () { case_text="${NODENESS}_${FLAVOR}" case "${case_text}" in "2n_aws") + export TF_VAR_testbed_name="${TEST_CODE}" terraform_init || die "Failed to call terraform init." terraform_apply || die "Failed to call terraform apply." ;; "3n_aws") + export TF_VAR_testbed_name="${TEST_CODE}" terraform_init || die "Failed to call terraform init." terraform_apply || die "Failed to call terraform apply." ;; @@ -708,7 +747,9 @@ function reserve_and_cleanup_testbed () { function run_pybot () { - # Run pybot with options based on input variables. Create output_info.xml + # Run pybot with options based on input variables. + # Generate INFO level output_info.xml by rebot. + # Archive UTI raw json outputs. # # Variables read: # - CSIT_DIR - Path to existing root of local CSIT git repository. @@ -732,13 +773,8 @@ function run_pybot () { PYBOT_EXIT_STATUS="$?" set -e - # Generate INFO level output_info.xml for post-processing. - all_options=("--loglevel" "INFO") - all_options+=("--log" "none") - all_options+=("--report" "none") - all_options+=("--output" "${ARCHIVE_DIR}/output_info.xml") - all_options+=("${ARCHIVE_DIR}/output.xml") - rebot "${all_options[@]}" || true + post_process_robot_outputs || die + popd || die "Change directory operation failed." } @@ -858,12 +894,20 @@ function select_tags () { awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";' awk_nics_sub_cmd+='else if ($9 =="drv_af_xdp") drv ="af-xdp-";' awk_nics_sub_cmd+='else drv="";' - awk_nics_sub_cmd+='print "*"$7"-" drv $11"-"$5"."$3"-"$1"-" drv $11"-"$5' + awk_nics_sub_cmd+='if ($1 =="-") cores="";' + awk_nics_sub_cmd+='else cores=$1;' + awk_nics_sub_cmd+='print "*"$7"-" drv $11"-"$5"."$3"-" cores "-" drv $11"-"$5' # Tag file directory shorthand. tfd="${JOB_SPECS_DIR}" case "${TEST_CODE}" in # Select specific performance tests based on jenkins job type variable. + *"device"* ) + readarray -t test_tag_array <<< $(grep -v "#" \ + ${tfd}/vpp_device/${DUT}-${NODENESS}-${FLAVOR}.md | + awk {"$awk_nics_sub_cmd"} || echo "devicetest") || die + SELECTION_MODE="--test" + ;; *"ndrpdr-weekly"* ) readarray -t test_tag_array <<< $(grep -v "#" \ ${tfd}/mlr_weekly/${DUT}-${NODENESS}-${FLAVOR}.md | @@ -922,6 +966,14 @@ function select_tags () { # Reasons for blacklisting: # - ipsechw - Blacklisted on testbeds without crypto hardware accelerator. case "${TEST_CODE}" in + *"1n-vbox"*) + test_tag_array+=("!avf") + test_tag_array+=("!vhost") + test_tag_array+=("!flow") + ;; + *"1n_tx2"*) + test_tag_array+=("!flow") + ;; *"2n-skx"*) test_tag_array+=("!ipsechw") ;; @@ -937,7 +989,6 @@ function select_tags () { test_tag_array+=("!ipsechw") ;; *"2n-dnv"*) - test_tag_array+=("!ipsechw") test_tag_array+=("!memif") test_tag_array+=("!srv6_proxy") test_tag_array+=("!vhost") @@ -972,12 +1023,14 @@ function select_tags () { set +x if [[ "${TEST_CODE}" == "vpp-"* ]]; then - # Automatic prefixing for VPP jobs to limit the NIC used and - # traffic evaluation to MRR. - if [[ "${TEST_TAG_STRING-}" == *"nic_"* ]]; then - prefix="${prefix}mrrAND" - else - prefix="${prefix}mrrAND${default_nic}AND" + if [[ "${TEST_CODE}" != *"device"* ]]; then + # Automatic prefixing for VPP perf jobs to limit the NIC used and + # traffic evaluation to MRR. + if [[ "${TEST_TAG_STRING-}" == *"nic_"* ]]; then + prefix="${prefix}mrrAND" + else + prefix="${prefix}mrrAND${default_nic}AND" + fi fi fi for tag in "${test_tag_array[@]}"; do @@ -1084,67 +1137,6 @@ function select_topology () { } -function select_vpp_device_tags () { - - # Variables read: - # - TEST_CODE - String affecting test selection, usually jenkins job name. - # - TEST_TAG_STRING - String selecting tags, from gerrit comment. - # Can be unset. - # Variables set: - # - TAGS - Array of processed tag boolean expressions. - - set -exuo pipefail - - case "${TEST_CODE}" in - # Select specific device tests based on jenkins job type variable. - * ) - if [[ -z "${TEST_TAG_STRING-}" ]]; then - # If nothing is specified, we will run pre-selected tests by - # following tags. Items of array will be concatenated by OR - # in Robot Framework. - test_tag_array=() - else - # If trigger contains tags, split them into array. - test_tag_array=(${TEST_TAG_STRING//:/ }) - fi - SELECTION_MODE="--include" - ;; - esac - - # Blacklisting certain tags per topology. - # - # Reasons for blacklisting: - # - avf - AVF is not possible to run on enic driver of VirtualBox. - # - vhost - VirtualBox does not support nesting virtualization on Intel CPU. - case "${TEST_CODE}" in - *"1n-vbox"*) - test_tag_array+=("!avf") - test_tag_array+=("!vhost") - ;; - *) - ;; - esac - - TAGS=() - - # We will prefix with devicetest to prevent running other tests - # (e.g. Functional). - prefix="devicetestAND" - if [[ "${TEST_CODE}" == "vpp-"* ]]; then - # Automatic prefixing for VPP jobs to limit testing. - prefix="${prefix}" - fi - for tag in "${test_tag_array[@]}"; do - if [[ ${tag} == "!"* ]]; then - # Exclude tags are not prefixed. - TAGS+=("${tag}") - else - TAGS+=("${prefix}${tag}") - fi - done -} - - function set_environment_variables () { # Depending on testbed topology, overwrite defaults set in the @@ -1162,6 +1154,7 @@ function set_environment_variables () { # T-Rex 2.88 workaround for ENA NICs export TREX_RX_DESCRIPTORS_COUNT=1024 export TREX_EXTRA_CMDLINE="--mbuf-factor 19" + export TREX_CORE_COUNT=6 # Settings to prevent duration stretching export PERF_TRIAL_STL_DELAY=0.1 ;;