openstack/project-config
Code Issues Proposed changes

Ensure a diff does not cause a non-zero return code

Browse Source 
Currently periodic jobs for oslo are failing since
tox was thinking the oslo-from-master.sh from master
script was dying. It wasn't actually, this should
fix that by making sure the diff command doesn't return
non-zero (we expect a difference).

Also show the post-alteration tox.ini, so that its
easier to see if a change to it is invalid (especially
when there are some further issue).

Change-Id: I6a73bab746f22e5ae749dc798a189c9f255cddda
This commit is contained in:
Joshua Harlow 2016-10-20 10:56:54 -07:00
parent cadc16ec57
commit dc53443d84
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jenkins/scripts/run-tox-with-oslo-master.sh
View File

@ -70,7 +70,11 @@ for lib in $oslo_libs; do
done
echo "Full freeze diff:"
diff -u pip_freeze_before.txt pip_freeze_after.txt
# Diff seems to exit with non-zero on a difference, but since
# we expect there to be a difference, we don't want to have this
# (or tox) fail due to that...
diff -u pip_freeze_before.txt pip_freeze_after.txt || true
EOF
@ -96,4 +100,7 @@ commands =
EOF
fi
echo "Post-modification tox.ini:"
cat tox.ini
$script_path/run-tox.sh $venv-oslo-master