X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-DMM.sh;h=2f72b25a92ecc1dcd9025606a778e029d0d1fb4d;hp=fd212c51efb9881fb2cc5042114d717e294ae615;hb=83aaeda489a47d4cf03ee84e2894e52aa9c9fcc8;hpb=374b35938abf48e742fb3438ae8ed1e9b47d84ce

diff --git a/bootstrap-DMM.sh b/bootstrap-DMM.sh
index fd212c51ef..2f72b25a92 100755
--- a/bootstrap-DMM.sh
+++ b/bootstrap-DMM.sh
@@ -17,12 +17,18 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
+JOB_ARCHIVE_ARTIFACTS=(log.html output.xml report.html *.log)
+LOG_ARCHIVE_ARTIFACTS=(log.html output.xml report.html *.log)
+JOB_ARCHIVE_DIR="archive"
+LOG_ARCHIVE_DIR="$WORKSPACE/archives"
+mkdir -p ${JOB_ARCHIVE_DIR}
+mkdir -p ${LOG_ARCHIVE_DIR}
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PYTHONPATH=${SCRIPT_DIR}
 
 if [ -f "/etc/redhat-release" ]; then
     DISTRO="CENTOS"
-    sudo yum install -y python-devel python-virtualenv
+    sudo yum install -y python-devel python-virtualenv openssh-clients sshpass
     DPDK_ARTIFACTS=""
     VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
     VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
@@ -180,13 +186,16 @@ echo "Selected VIRL servers: ${VIRL_SERVER[@]}"
 DMM_TAR_FILE="dmm_depends.tar.gz"
 
 cd dmm/scripts/
-./build.sh
+./build.sh all
 cd -
 
-mv /tmp/dpdk/dpdk-18.02.tar.xz .
+DPDK_DOWNLOAD_PATH=$(cat dmm/scripts/build_dpdk.sh | grep DPDK_DOWNLOAD_PATH=  | cut -d "=" -f2)
+mv $DPDK_DOWNLOAD_PATH/dpdk-18.02.tar.xz .
 
 wget http://security.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma1_2.0.11-1ubuntu1.1_amd64.deb
 wget http://security.ubuntu.com/ubuntu/pool/main/n/numactl/libnuma-dev_2.0.11-1ubuntu1.1_amd64.deb
+wget http://security.ubuntu.com/ubuntu/pool/main/e/ethtool/ethtool_4.5-1_amd64.deb
+wget http://security.ubuntu.com/ubuntu/pool/main/l/lsof/lsof_4.89+dfsg-0.1_amd64.deb
 
 tar zcf ${DMM_TAR_FILE} dpdk-18.02.tar.xz  ./dmm/ libnuma*.deb
 
@@ -424,6 +433,15 @@ rebot --noncritical EXPECTED_FAILING \
 # Remove unnecessary log files
 rm -f ${partial_logs}
 
+# 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
+
 echo Post-processing finished.
 
 if [ ${RC} -eq 0 ]; then