diff options
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/functest/res-build.sh | 47 |
2 files changed, 2 insertions, 49 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 4152193e7..574b3f30c 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -245,7 +245,7 @@ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ -e CI_DEBUG=${CI_DEBUG}" - dir_result="${HOME}/opnfv/functest/reports" + dir_result="${HOME}/opnfv/functest/results/" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" @@ -279,7 +279,7 @@ name: functest-store-results builders: - shell: - !include-raw: res-build.sh + !include-raw: ../../utils/push-test-logs.sh - builder: name: functest-cleanup diff --git a/jjb/functest/res-build.sh b/jjb/functest/res-build.sh deleted file mode 100644 index 5785b952a..000000000 --- a/jjb/functest/res-build.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 Orange and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e -set -o pipefail - -export PATH=$PATH:/usr/local/bin/ - -git_sha1="$(git rev-parse HEAD)" -res_build_date=$(date -u +"%Y-%m-%d_%H-%M-%S") - -# Result directory in the jumphost -# to be used only with CI -dir_result="${HOME}/opnfv/functest/results" - -# Clean the results directory -# remove json file for rally, export only html -# json should have been pushed into the DB -rm -f $dir_result/rally/*.json - -# Several information are required: date and testbed -# date is generated by functest so on the artifact, the results shall be under functest/<testbed id>/date/ -testbed=$NODE_NAME - -project_artifact=logs/functest/$testbed/$res_build_date - -# copy folder to artifact -if [ -d "$dir_result" ]; then - if [ "$(ls -A $dir_result)" ]; then - echo "copy result files to artifact $project_artifact" - gsutil -m cp -r "$dir_result" gs://artifacts.opnfv.org/"$project_artifact"/ - - # delete local results - # should not be useful as the container is about to die...just in case - rm -Rf /home/opnfv/functest/results/* - else - echo "Result folder is empty" - fi -else - echo "No result folder found" -fi |