diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-08-06 12:33:36 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-08-06 12:33:36 -0400 |
| commit | 3f79d23b6bf0bc0beb83a010ec9701e91b158149 (patch) | |
| tree | ea3e080efee6b537e000dc25252e12078b0d4ea7 | |
| parent | bad1efa24f143c7c016b7d629f151ef083372b61 (diff) | |
CPERF: Fix ODL_STREAM to not include 'stable/'
CSIT variable needs to be the branch short name. Also, removes duplicate
log upload and fixes the upload path to use short name (to avoid '/' in
path for branch)
Change-Id: I5e1dac15fdbc1eca6c9edaf8b554c3362fd7a558
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 8 | ||||
| -rw-r--r-- | jjb/cperf/cperf-upload-logs-csit.sh | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index d40ad943a..b07955c78 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -13,10 +13,10 @@ fi if [ "$ODL_BRANCH" == 'master' ]; then ODL_STREAM='flourine' else - ODL_STREAM=${ODL_BRANCH} + ODL_STREAM=${ODL_BRANCH#"stable/"} fi -echo "ODL Branch set: ${ODL_BRANCH} and OS Version is ${FULL_OS_VER}" +echo "ODL Stream set: ${ODL_STREAM} and OS Version is ${FULL_OS_VER}" sudo rm -rf releng git clone https://gerrit.opnfv.org/gerrit/releng.git @@ -128,7 +128,3 @@ docker run -i --net=host \ /bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \ cd /home/opnfv/repos/odl_test/ && git pull origin master; \ ${robot_cmd} ${suites};" - -UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_BRANCH}/${BUILD_NUMBER}/ -echo "Uploading robot logs to ${UPLOAD_LOCATION}" -gsutil -m cp -r -v ${LOGS_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log diff --git a/jjb/cperf/cperf-upload-logs-csit.sh b/jjb/cperf/cperf-upload-logs-csit.sh index 7bf91df8b..bd8680406 100644 --- a/jjb/cperf/cperf-upload-logs-csit.sh +++ b/jjb/cperf/cperf-upload-logs-csit.sh @@ -4,7 +4,9 @@ set -o errexit set -o nounset set -o pipefail +ODL_STREAM=${ODL_BRANCH#"stable/"} + LOGS_LOCATION=/tmp/robot_results -UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_BRANCH}/${BUILD_NUMBER}/ +UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_STREAM}/${BUILD_NUMBER}/ echo "Uploading robot logs to ${UPLOAD_LOCATION}" gsutil -m cp -r -v ${LOGS_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log |