Move 'check-cherry-picks' test to gate, n-v check

Code Issues Proposed changes

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>

This commit is contained in:

Stephen Finucane

2021年06月16日 12:00:19 +01:00

parent 22830d78b9

commit 98b01c9a59

3 changed files with 24 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

16
.zuul.yaml

View File

@@ -50,6 +50,17 @@

bindep_profile:test py39

timeout:3600

- job:

name:nova-tox-validate-backport

parent:openstack-tox

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.

Uses tox with the ``validate-backport`` environment.

vars:

tox_envlist:validate-backport

- job:

name:nova-live-migration

parent:tempest-multinode-full-py3

@@ -159,7 +170,7 @@

# Disable non-essential services that we don't need for this job.

c-bak:false

#TODO(lucasagomes): Move this job to ML2/OVN when QoS Minimum Bandwidth

# support is implemented.

# See: https://docs.openstack.org/neutron/latest/ovn/gaps.html

- job:

@@ -494,6 +505,8 @@

- nova-lvm

- nova-multi-cell

- nova-next

- nova-tox-validate-backport:

voting:false

- nova-tox-functional-py38

- nova-tox-functional-py39:

voting:false

@@ -535,6 +548,7 @@

- nova-tox-functional-py38

- nova-multi-cell

- nova-next

- nova-tox-validate-backport

- nova-ceph-multistore:

irrelevant-files:*nova-base-irrelevant-files

- neutron-tempest-linuxbridge:

5
tools/check-cherry-picks.sh

View File

@@ -4,11 +4,6 @@

# to verify that they're all on either master or stable/ branches

#

# Allow this script to be disabled by a simple env var

if [ ${DISABLE_CHERRY_PICK_CHECK:-0} -eq 1 ]; then

exit 0

fi

commit_hash=""

# Check if the patch is a merge patch by counting the number of parents.

12
tox.ini

View File

@@ -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.