openstack/rally-openstack
Code Issues Proposed changes

Merge "Support PYTHON3 gate jobs"

Browse Source
This commit is contained in:
Jenkins 2017-01-10 05:10:00 +00:00 committed by Gerrit Code Review
commit 46b83b9b5d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/ci/rally_gate_functions.sh
View File

@ -99,12 +99,19 @@ function run () {
TASK=$1 TASK=$1
TASK_ARGS="$2 $3" TASK_ARGS="$2 $3"
python $RALLY_DIR/tests/ci/osresources.py --dump-list resources_at_start.txt
if [ "$DEVSTACK_GATE_USE_PYTHON3" = "True" ]; then
PYTHON=python3
else
PYTHON=python
fi
$PYTHON $RALLY_DIR/tests/ci/osresources.py --dump-list resources_at_start.txt
rally --rally-debug task start --task $TASK $TASK_ARGS rally --rally-debug task start --task $TASK $TASK_ARGS
mkdir -p rally-plot/extra mkdir -p rally-plot/extra
python $RALLY_DIR/tests/ci/render.py ci/index.html > rally-plot/extra/index.html $PYTHON $RALLY_DIR/tests/ci/render.py ci/index.html > rally-plot/extra/index.html
cp $TASK rally-plot/task.txt cp $TASK rally-plot/task.txt
tar -czf rally-plot/plugins.tar.gz -C $RALLY_PLUGINS_DIR . tar -czf rally-plot/plugins.tar.gz -C $RALLY_PLUGINS_DIR .
rally task results | python -m json.tool > rally-plot/results.json rally task results | python -m json.tool > rally-plot/results.json
@ -124,7 +131,7 @@ function run () {
set -e set -e
cp resources_at_start.txt rally-plot/ cp resources_at_start.txt rally-plot/
python $RALLY_DIR/tests/ci/osresources.py\ $PYTHON $RALLY_DIR/tests/ci/osresources.py\
--compare-with-list resources_at_start.txt\ --compare-with-list resources_at_start.txt\
| gzip > rally-plot/resources_diff.txt.gz | gzip > rally-plot/resources_diff.txt.gz