From f66bdbdcf7f238034d447c37facb2623f71df06a Mon Sep 17 00:00:00 2001 From: selias Date: Tue, 13 Dec 2016 10:43:38 +0100 Subject: [PATCH] HC Test: fix artifact archiving in csit-hc2vpp jobs - scp the honeycomb log from virl DUT - remove unused bootstrap file left over from the old job Change-Id: I863436bb8865d2003812e21f01854855059665f6 Signed-off-by: selias --- bootstrap-hc2vpp-integration.sh | 6 ++ bootstrap-hc2vpp-verify.sh | 6 ++ bootstrap-vpp-honeycomb.sh | 213 ---------------------------------------- 3 files changed, 12 insertions(+), 213 deletions(-) delete mode 100755 bootstrap-vpp-honeycomb.sh diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh index 9554924122..0e0b8425c6 100755 --- a/bootstrap-hc2vpp-integration.sh +++ b/bootstrap-hc2vpp-integration.sh @@ -210,3 +210,9 @@ PYTHONPATH=`pwd` pybot -L TRACE -W 136\ --include honeycomb_sanity \ --noncritical EXPECTED_FAILING \ tests/ + +# Get Honeycomb log file from virl host +# log only exists on DUT1 +for index in "${!VIRL_SERVER[@]}"; do + scp ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:/var/log/honeycomb/honeycomb.log . || true +done diff --git a/bootstrap-hc2vpp-verify.sh b/bootstrap-hc2vpp-verify.sh index 947ad95312..2f0ec20f61 100755 --- a/bootstrap-hc2vpp-verify.sh +++ b/bootstrap-hc2vpp-verify.sh @@ -207,3 +207,9 @@ PYTHONPATH=`pwd` pybot -L TRACE -W 136\ --include honeycomb_sanity \ --noncritical EXPECTED_FAILING \ tests/ + +# Get Honeycomb log file from virl host +# log only exists on DUT1 +for index in "${!VIRL_SERVER[@]}"; do + scp ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:/var/log/honeycomb/honeycomb.log . || true +done diff --git a/bootstrap-vpp-honeycomb.sh b/bootstrap-vpp-honeycomb.sh deleted file mode 100755 index 41bb4db78d..0000000000 --- a/bootstrap-vpp-honeycomb.sh +++ /dev/null @@ -1,213 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 Cisco 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -x - -cat /etc/hostname -cat /etc/hosts - -export DEBIAN_FRONTEND=noninteractive -sudo apt-get -y update -sudo apt-get -y install libpython2.7-dev python-virtualenv - -VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30") -VIRL_SERVER="" - -VIRL_USERNAME=jenkins-in -VIRL_PKEY=priv_key -VIRL_SERVER_STATUS_FILE="status" -VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" - -VIRL_TOPOLOGY=double-ring-nested.trusty -VIRL_RELEASE=csit-ubuntu-14.04.4_2016-10-07_1.3 - -SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" - -function ssh_do() { - echo - echo "### " ssh $@ - ssh ${SSH_OPTIONS} $@ -} - -rm -f ${VIRL_PKEY} -cat > ${VIRL_PKEY} <&1) - echo VIRL HOST $virl_server_candidate status is \"$virl_server_status\" - if [ "$virl_server_status" == "$VIRL_SERVER_EXPECTED_STATUS" ] - then - # Candidate is in good status. Select this server. - VIRL_SERVER="$virl_server_candidate" - else - # Candidate is in bad status. Remove from array. - VIRL_SERVERS=("${VIRL_SERVERS[@]:0:$element}" "${VIRL_SERVERS[@]:$[$element+1]}") - fi -done - -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Download the latest VPP and HC .deb packages -echo Downloading packages... -bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh - -VPP_DEBS=(*.deb) -echo ${VPP_DEBS[@]} -VIRL_DIR_LOC="/tmp" -VPP_DEBS_FULL=(${VPP_DEBS[@]}) - -# Prepend directory location at remote host to deb file list -for index in "${!VPP_DEBS_FULL[@]}"; do - VPP_DEBS_FULL[${index}]=${VIRL_DIR_LOC}/${VPP_DEBS_FULL[${index}]} -done - -echo "Updated file names: " ${VPP_DEBS_FULL[@]} - -cat ${VIRL_PKEY} - -# Copy the files to VIRL hosts -DONE="" -for index in "${!VIRL_SERVER[@]}"; do - # Do not copy files in case they have already been copied to the VIRL host - [[ "${DONE[@]}" =~ "${VIRL_SERVER[${index}]}" ]] && copy=0 || copy=1 - - if [ "${copy}" -eq "0" ]; then - echo "deb files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}" - else - scp ${SSH_OPTIONS} *.deb \ - ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/ - - result=$? - if [ "${result}" -ne "0" ]; then - echo "Failed to copy deb files to VIRL host ${VIRL_SERVER[${index}]}" - echo ${result} - exit ${result} - else - echo "deb files successfully copied to the VIRL host ${VIRL_SERVER[${index}]}" - fi - DONE+=(${VIRL_SERVER[${index}]}) - fi -done - -# Start a simulation on VIRL server -echo "Starting simulation on VIRL server" - -function stop_virl_simulation { - ssh ${SSH_OPTIONS} ${VIRL_USERNAME}@${VIRL_SERVER}\ - "stop-testcase ${VIRL_SID}" -} - -VIRL_SID=$(ssh ${SSH_OPTIONS} \ - ${VIRL_USERNAME}@${VIRL_SERVER} \ - "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_FULL[@]}") -retval=$? -if [ ${retval} -ne "0" ]; then - echo "VIRL simulation start failed" - exit ${retval} -fi - -if [[ ! "${VIRL_SID}" =~ session-[a-zA-Z0-9_]{6} ]]; then - echo "No VIRL session ID reported." - exit 127 -fi - -# Upon script exit, cleanup the simulation execution -trap stop_virl_simulation EXIT -echo ${VIRL_SID} - -ssh_do ${VIRL_USERNAME}@${VIRL_SERVER} cat /scratch/${VIRL_SID}/topology.yaml - -# Download the topology file from virl session -scp ${SSH_OPTIONS} \ - ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/topology.yaml \ - topologies/enabled/topology.yaml - -retval=$? -if [ ${retval} -ne "0" ]; then - echo "Failed to copy topology file from VIRL simulation" - exit ${retval} -fi - -virtualenv --system-site-packages env -. env/bin/activate - -echo pip install -pip install -r ${SCRIPT_DIR}/requirements.txt - -pykwalify -s ${SCRIPT_DIR}/resources/topology_schemas/3_node_topology.sch.yaml \ - -s ${SCRIPT_DIR}/resources/topology_schemas/topology.sch.yaml \ - -d ${SCRIPT_DIR}/topologies/enabled/topology.yaml \ - -vvv - -if [ "$?" -ne "0" ]; then - echo "Topology schema validation failed." - echo "However, the tests will start." -fi - -PYTHONPATH=`pwd` pybot -L TRACE -W 136\ - -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ - --suite "tests.func" \ - --include honeycomb_sanity \ - --noncritical EXPECTED_FAILING \ - tests/ -- 2.16.6