diff --git a/Jenkinsfile b/Jenkinsfile index c6faad36c..c72b0fc6f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -407,9 +407,11 @@ def runScript(Map params = [:]){ deleteDir() sh "mkdir ${env.PIP_CACHE}" unstash 'source' - dir("${BASE_DIR}"){ - retryWithSleep(retries: 2, seconds: 5, backoff: true) { - sh("./tests/scripts/docker/run_tests.sh ${python} ${framework}") + filebeat(output: "${label}_${framework}.log", workdir: "${env.WORKSPACE}") { + dir("${BASE_DIR}"){ + retryWithSleep(retries: 2, seconds: 5, backoff: true) { + sh("./tests/scripts/docker/run_tests.sh ${python} ${framework}") + } } } } diff --git a/tests/scripts/docker/docker-summary.sh b/tests/scripts/docker/docker-summary.sh deleted file mode 100755 index 09ded27ce..000000000 --- a/tests/scripts/docker/docker-summary.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -DOCKER_IDS=$(docker ps -aq) - -for id in ${DOCKER_IDS} -do - echo "***********************************************************" - echo "***************Docker Container ${id}***************" - echo "***********************************************************" - docker ps -af id=${id} --no-trunc - echo "----" - docker logs ${id} | tail -n 10 || echo "It is not possible to grab the logs of ${id}" -done - -echo "*******************************************************" -echo "***************Docker Containers Summary***************" -echo "*******************************************************" -docker ps -a diff --git a/tests/scripts/docker/run_tests.sh b/tests/scripts/docker/run_tests.sh index 44dc8ca74..e497f7cc1 100755 --- a/tests/scripts/docker/run_tests.sh +++ b/tests/scripts/docker/run_tests.sh @@ -2,9 +2,6 @@ set -ex function cleanup { - if [ -n "${BUILD_NUMBER}" ]; then # only on CI - ./scripts/docker/docker-summary.sh - fi PYTHON_VERSION=${1} docker-compose down -v if [[ $CODECOV_TOKEN ]]; then