summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDan Smith <dansmith@redhat.com>2020-06-11 10:42:13 -0700
committerDan Smith <dansmith@redhat.com>2020-06-15 11:15:31 -0700
commitaebc829c4e0d39a160eaaa5ad949c1256c8179e6 (patch)
tree31809b4dd6cc2b9e0ffa3ffe9c1671417b8b3a59 /tox.ini
parenta9e0b0573da65074db686ceb0c5cc000ec7110f1 (diff)
downloadnova-aebc829c4e0d39a160eaaa5ad949c1256c8179e6.tar.gz
Check cherry-pick hashes in pep8 tox target
This adds a tools/ script that checks any cherry-picked hashes on the current commit (or a provided commit) to make sure that all the hashes exist on at least master or stable/.* branches. This should help avoid accidentally merging stable backports where one of the hashes along the line has changed due to conflicts. Change-Id: I4afaa0808b75cc31a8dd14663912c162281a1a42
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 2645971ba0..911465a9d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,6 +56,7 @@ commands =
bash -c "! find doc/ -type f -name *.json | xargs grep -U -n $'\r'"
# Check that all included JSON files are valid JSON
bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python'
+ bash tools/check-cherry-picks.sh
[testenv:fast8]
description =