hostname=$(grep search /etc/resolv.conf | cut -d' ' -f3) || die
ssh="ssh root@${hostname} -p 6022"
run="activate_wrapper ${NODENESS} ${FLAVOR} ${device_image}"
+ # The "declare -f" output is long and boring.
+ set +x
# backtics to avoid https://midnight-commander.org/ticket/2142
env_vars=`${ssh} "$(declare -f); ${run}"` || {
die "Topology reservation via shim-dcr failed!"
}
+ set -x
set -a
source <(echo "$env_vars" | grep -v /usr/bin/docker) || {
die "Source failed!"
env_dir="${root_path}/env"
req_path=${2-$CSIT_DIR/requirements.txt}
rm -rf "${env_dir}" || die "Failed to clean previous virtualenv."
- pip install --upgrade virtualenv || {
+ pip3 install --upgrade virtualenv || {
die "Virtualenv package install failed."
}
- virtualenv "${env_dir}" || {
- die "Virtualenv creation failed."
+ virtualenv --python=$(which python3) "${env_dir}" || {
+ die "Virtualenv creation for $(which python3) failed."
}
set +u
source "${env_dir}/bin/activate" || die "Virtualenv activation failed."
set -u
- pip install --upgrade -r "${req_path}" || {
+ pip3 install --upgrade -r "${req_path}" || {
die "Requirements installation failed."
}
# Most CSIT Python scripts assume PYTHONPATH is set and exported.
hostname=$(grep search /etc/resolv.conf | cut -d' ' -f3) || die
ssh="ssh root@${hostname} -p 6022"
env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die
+ # The "declare -f" output is long and boring.
+ set +x
${ssh} "$(declare -f); deactivate_wrapper ${env_vars}" || {
die "Topology cleanup via shim-dcr failed!"
}
+ set -x
;;
"1n_vbox")
enter_mutex || die
# - TEST_CODE - The test selection string from environment or argument.
# Variables set:
# - TEST_TAG_STRING - The string following trigger word in gerrit comment.
- # May be empty, not set on event types not adding comment.
+ # May be empty, or even not set on event types not adding comment.
# TODO: ci-management scripts no longer need to perform this.
set -exuo pipefail
- trigger=""
if [[ "${GERRIT_EVENT_TYPE-}" == "comment-added" ]]; then
case "${TEST_CODE}" in
*"device"*)
- # On parsing error, ${trigger} stays empty.
- trigger="$(echo "${GERRIT_EVENT_COMMENT_TEXT}" \
- | grep -oE '(devicetest$|devicetest[[:space:]].+$)' \
- || true)"
- # Set test tags as string.
- TEST_TAG_STRING="${trigger#$"devicetest"}"
+ trigger="devicetest"
;;
*"perf"*)
- # On parsing error, ${trigger} stays empty.
- comment="${GERRIT_EVENT_COMMENT_TEXT}"
- # As "perftest" can be followed by something, we substitute it.
- comment="${comment/perftest-2n/perftest}"
- comment="${comment/perftest-3n/perftest}"
- comment="${comment/perftest-hsw/perftest}"
- comment="${comment/perftest-skx/perftest}"
- comment="${comment/perftest-dnv/perftest}"
- comment="${comment/perftest-tsh/perftest}"
- tag_string="$(echo "${comment}" \
- | grep -oE '(perftest$|perftest[[:space:]].+$)' || true)"
- # Set test tags as string.
- TEST_TAG_STRING="${tag_string#$"perftest"}"
+ trigger="perftest"
;;
*)
die "Unknown specification: ${TEST_CODE}"
esac
+ # Ignore lines not containing the trigger word.
+ comment=$(fgrep "${trigger}" <<< "${GERRIT_EVENT_COMMENT_TEXT}") || true
+ # The vpp-csit triggers trail stuff we are not interested in.
+ # Removing them and trigger word: https://unix.stackexchange.com/a/13472
+ # (except relying on \s whitespace, \S non-whitespace and . both).
+ # The last string is concatenated, only the middle part is expanded.
+ cmd=("grep" "-oP" '\S*'"${trigger}"'\S*\s\K.+$') || die "Unset trigger?"
+ # On parsing error, TEST_TAG_STRING probably stays empty.
+ TEST_TAG_STRING=$("${cmd[@]}" <<< "${comment}") || true
fi
}
set +e
scrpt="${PYTHON_SCRIPTS_DIR}/topo_reservation.py"
opts=("-t" "${topo}" "-r" "${BUILD_TAG:-Unknown}")
- python "${scrpt}" "${opts[@]}"
+ python3 "${scrpt}" "${opts[@]}"
result="$?"
set -e
if [[ "${result}" == "0" ]]; then
pushd "${CSIT_DIR}" || die "Change directory operation failed."
set +e
- pybot "${all_options[@]}" "${GENERATED_DIR}/tests/"
+ robot "${all_options[@]}" "${GENERATED_DIR}/tests/"
PYBOT_EXIT_STATUS="$?"
set -e
esac
sed_nic_sub_cmd="sed s/\${default_nic}/${default_nic}/"
+ sed_nics_sub_cmd="sed -e s/ANDxxv710/ANDnic_intel-xxv710/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDx710/ANDnic_intel-x710/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDxl710/ANDnic_intel-xl710/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDx520-da2/ANDnic_intel-x520-da2/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDx553/ANDnic_intel-x553/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDcx556a/ANDnic_mellanox-cx556a/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDvic1227/ANDnic_cisco-vic-1227/"
+ sed_nics_sub_cmd+=" | sed -e s/ANDvic1385/ANDnic_cisco-vic-1385/"
# Tag file directory shorthand.
tfd="${BASH_FUNCTION_DIR}"
case "${TEST_CODE}" in
readarray -t test_tag_array < "${tfd}/mlr-weekly.txt" || die
;;
*"mrr-daily"* )
- readarray -t test_tag_array <<< $(${sed_nic_sub_cmd} \
- ${tfd}/mrr-daily-${FLAVOR}.txt) || die
+ readarray -t test_tag_array <<< $(sed 's/ //g' \
+ ${tfd}/mrr-daily-${NODENESS}-${FLAVOR}.txt |
+ eval ${sed_nics_sub_cmd}) || die
;;
*"mrr-weekly"* )
readarray -t test_tag_array <<< $(${sed_nic_sub_cmd} \
warn "Testbed looks unreserved already. Trap removal failed before?"
else
ansible_hosts "cleanup" || true
- python "${PYTHON_SCRIPTS_DIR}/topo_reservation.py" -c -t "${wt}" || {
+ python3 "${PYTHON_SCRIPTS_DIR}/topo_reservation.py" -c -t "${wt}" || {
die "${1:-FAILED TO UNRESERVE, FIX MANUALLY.}" 2
}
WORKING_TOPOLOGY=""
Code Review / csit.git / blobdiff