- Add output.xml auto-archiving to logs.fd.io.
- Cleanup from obsolete code.
Change-Id: Iafa9ef802264d2ad36ca0f556cb14d2b3ca0f179
Signed-off-by: Peter Mikus <pmikus@cisco.com>
PYBOT_ARGS="-W 150 -L TRACE"
PYBOT_ARGS="-W 150 -L TRACE"
-ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml output_perf_data.json)
+JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html output_perf_data.xml)
+LOG_ARCHIVE_ARTIFACTS=(output.xml)
+LOG_ARCHIVES_DIR="$WORKSPACE/archives"
+mkdir -p ${LOG_ARCHIVES_DIR}
# If we run this script from CSIT jobs we want to use stable vpp version
if [[ ${JOB_NAME} == csit-* ]] ;
# If we run this script from CSIT jobs we want to use stable vpp version
if [[ ${JOB_NAME} == csit-* ]] ;
mkdir vpp_download
cd vpp_download
mkdir vpp_download
cd vpp_download
- if [[ ${TEST_TAG} == *NIGHTLY ]] || \
- [[ ${TEST_TAG} == *DAILY ]] || \
+ if [[ ${TEST_TAG} == *DAILY ]] || \
[[ ${TEST_TAG} == *WEEKLY ]];
then
# Download the latest VPP build .deb install packages
[[ ${TEST_TAG} == *WEEKLY ]];
then
# Download the latest VPP build .deb install packages
--include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \
tests/
RETURN_STATUS=$(echo $?)
--include ndrdiscAND1t1cANDipsecORndrdiscAND2t2cANDipsec \
tests/
RETURN_STATUS=$(echo $?)
+ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log
+ done
;;
PERFTEST_SEMI_WEEKLY )
pybot ${PYBOT_ARGS} \
;;
PERFTEST_SEMI_WEEKLY )
pybot ${PYBOT_ARGS} \
--include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \
tests/
RETURN_STATUS=$(echo $?)
--include ndrdiscANDnic_intel-x710AND1t1cORndrdiscANDnic_intel-x710AND2t2cORndrdiscANDnic_intel-xl710AND1t1cORndrdiscANDnic_intel-xl710AND2t2c \
tests/
RETURN_STATUS=$(echo $?)
+ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log
+ done
;;
VERIFY-PERF-NDRDISC )
pybot ${PYBOT_ARGS} \
;;
VERIFY-PERF-NDRDISC )
pybot ${PYBOT_ARGS} \
--include mrrAND1t1cORmrrAND2t2c \
tests/
RETURN_STATUS=$(echo $?)
--include mrrAND1t1cORmrrAND2t2c \
tests/
RETURN_STATUS=$(echo $?)
+ for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
+ cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVES_DIR}/${i}.log
+ done
;;
VERIFY-PERF-IP4 )
pybot ${PYBOT_ARGS} \
;;
VERIFY-PERF-IP4 )
pybot ${PYBOT_ARGS} \
# Archive artifacts
mkdir -p archive
# Archive artifacts
mkdir -p archive
-for i in ${ARCHIVE_ARTIFACTS[@]}; do
+for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done
cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
done
(ret_code, stdout, stderr) = \
ssh.exec_command_sudo('service vpp restart', timeout=120)
if int(ret_code) != 0:
(ret_code, stdout, stderr) = \
ssh.exec_command_sudo('service vpp restart', timeout=120)
if int(ret_code) != 0:
- logger.debug('stdout: {0}'.format(stdout))
- logger.debug('stderr: {0}'.format(stderr))
raise Exception('DUT {0} failed to start VPP service'.
format(node['host']))
raise Exception('DUT {0} failed to start VPP service'.
format(node['host']))
ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.
format(Constants.REMOTE_FW_DIR,
Constants.RESOURCES_LIB_SH), timeout=120)
ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.
format(Constants.REMOTE_FW_DIR,
Constants.RESOURCES_LIB_SH), timeout=120)
- logger.trace(stdout)
- logger.trace(stderr)
if int(ret_code) != 0:
logger.debug('DUT {0} setup script failed: "{1}"'.
format(node['host'], stdout + stderr))
if int(ret_code) != 0:
logger.debug('DUT {0} setup script failed: "{1}"'.
format(node['host'], stdout + stderr))