diff options
author | Stephen Finucane <stephenfin@redhat.com> | 2021-06-16 12:00:19 +0100 |
---|---|---|
committer | Stephen Finucane <stephenfin@redhat.com> | 2021-06-16 15:51:38 +0100 |
commit | 98b01c9a59df4912f5a162c2c52d1f00c84d24c2 (patch) | |
tree | 9c0691de25edec8e0a8339210b62dbe706267912 /tox.ini | |
parent | 22830d78b91946b108defe26b3a8ddefc2247363 (diff) | |
download | nova-98b01c9a59df4912f5a162c2c52d1f00c84d24c2.tar.gz |
Move 'check-cherry-picks' test to gate, n-v check
This currently runs in the 'check' pipeline, as part of the pep8 job,
which causes otherwise perfectly valid backports to report as failing
CI. There's no reason a stable core shouldn't be encouraged to review
these patches: we simply want to prevent them *merging* before their
parent(s). Resolve this conflict by moving the check to separate voting
job in the 'gate' pipeline as well as a non-voting job in the 'check'
pipeline to catch more obvious issues.
Change-Id: Id3e4452883f6a3cf44ff58b39ded82e882e28c23
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -51,8 +51,6 @@ commands = description = Run style checks. envdir = {toxworkdir}/shared -passenv = - DISABLE_CHERRY_PICK_CHECK commands = {[testenv:mypy]commands} bash tools/flake8wrap.sh {posargs} @@ -60,7 +58,6 @@ 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 = @@ -69,6 +66,15 @@ envdir = {toxworkdir}/shared commands = bash tools/flake8wrap.sh -HEAD +[testenv:validate-backport] +description = + Determine whether a backport is ready to be merged by checking whether it has + already been merged to master or more recent stable branches. +deps = +skipsdist = true +commands = + bash tools/check-cherry-picks.sh + [testenv:functional] description = Run functional tests using python3. |