From 0ac66d491ae486ad5d553eecb5aa400ca1fbd9db Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 15 May 2018 10:31:19 +0200 Subject: [PATCH] HC tests: archive JOB artifacts to logs.fd.io Change-Id: I305c9fd0b5653cc749716a8e700fb4c75a9252a6 Signed-off-by: Marek Gradzki --- bootstrap-hc2vpp-integration-odl.sh | 18 +++++++++++++----- bootstrap-hc2vpp-integration.sh | 18 +++++++++++++----- bootstrap-hc2vpp-perf.sh | 18 +++++++++++++----- bootstrap-hc2vpp-verify-odl.sh | 18 +++++++++++++----- bootstrap-hc2vpp-verify.sh | 19 +++++++++++++------ 5 files changed, 65 insertions(+), 26 deletions(-) diff --git a/bootstrap-hc2vpp-integration-odl.sh b/bootstrap-hc2vpp-integration-odl.sh index 900e6deee3..e9208e97e8 100755 --- a/bootstrap-hc2vpp-integration-odl.sh +++ b/bootstrap-hc2vpp-integration-odl.sh @@ -27,7 +27,12 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} STREAM=$1 OS=$2 @@ -244,10 +249,13 @@ RETURN_STATUS=$? scp ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true -# Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done exit ${RETURN_STATUS} diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh index 60cdf6a9dd..f2858ffbad 100755 --- a/bootstrap-hc2vpp-integration.sh +++ b/bootstrap-hc2vpp-integration.sh @@ -27,7 +27,12 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} STREAM=$1 OS=$2 @@ -242,10 +247,13 @@ RETURN_STATUS=$? scp ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true -# Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done exit ${RETURN_STATUS} diff --git a/bootstrap-hc2vpp-perf.sh b/bootstrap-hc2vpp-perf.sh index 2d5b49d26b..1cbf60b8c8 100755 --- a/bootstrap-hc2vpp-perf.sh +++ b/bootstrap-hc2vpp-perf.sh @@ -31,7 +31,12 @@ INSTALLATION_DIR="/tmp/install_dir" PYBOT_ARGS="-W 150 -L TRACE" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} WORKING_TOPOLOGY="" export PYTHONPATH=${SCRIPT_DIR} @@ -108,10 +113,13 @@ fi tests/ RETURN_STATUS=$(echo $?) -# Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done exit ${RETURN_STATUS} diff --git a/bootstrap-hc2vpp-verify-odl.sh b/bootstrap-hc2vpp-verify-odl.sh index 92422d0269..706c558b10 100755 --- a/bootstrap-hc2vpp-verify-odl.sh +++ b/bootstrap-hc2vpp-verify-odl.sh @@ -27,7 +27,12 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} OS=$1 ODL=$2 @@ -243,10 +248,13 @@ RETURN_STATUS=$? scp ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true -# Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done exit ${RETURN_STATUS} diff --git a/bootstrap-hc2vpp-verify.sh b/bootstrap-hc2vpp-verify.sh index 603a969915..6c136759be 100755 --- a/bootstrap-hc2vpp-verify.sh +++ b/bootstrap-hc2vpp-verify.sh @@ -27,8 +27,12 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) - +JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log) +JOB_ARCHIVE_DIR="archive" +LOG_ARCHIVE_DIR="$WORKSPACE/archives" +mkdir -p ${JOB_ARCHIVE_DIR} +mkdir -p ${LOG_ARCHIVE_DIR} OS=$1 if [ -f "/etc/redhat-release" ]; then @@ -238,10 +242,13 @@ RETURN_STATUS=$? scp ${SSH_OPTIONS} \ ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true -# Archive artifacts -mkdir archive -for i in ${ARCHIVE_ARTIFACTS[@]}; do - cp $( readlink -f ${i} | tr '\n' ' ' ) archive/ +# Archive JOB artifacts in jenkins +for i in ${JOB_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${JOB_ARCHIVE_DIR}/ +done +# Archive JOB artifacts to logs.fd.io +for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do + cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/ done exit ${RETURN_STATUS} -- 2.16.6