diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-03 20:03:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-03 20:03:05 +0000 |
| commit | 4ce01d6c49f81b6b2438549b01a89ea1b5956320 (patch) | |
| tree | d20f22ab08c0cb40e11d240366a17ba32493010d | |
| parent | b2fd01f0b4871dd0182daf234e0531a59e910621 (diff) | |
| parent | b7677ae08ae151858ecb0e67039e54bb3df89700 (diff) | |
| download | nova-4ce01d6c49f81b6b2438549b01a89ea1b5956320.tar.gz | |
Merge "Move 'check-cherry-picks' test to gate, n-v check" into stable/victoria
| -rw-r--r-- | .zuul.yaml | 14 | ||||
| -rwxr-xr-x | tools/check-cherry-picks.sh | 5 | ||||
| -rw-r--r-- | tox.ini | 12 |
3 files changed, 23 insertions, 8 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 2c887b4d84..c00865e504 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -57,6 +57,17 @@ 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 description: | @@ -424,6 +435,8 @@ - nova-lvm - nova-multi-cell - nova-next + - nova-tox-validate-backport: + voting: false - nova-tox-functional-py38 - tempest-integrated-compute: # NOTE(gmann): Policies changes do not need to run all the @@ -462,6 +475,7 @@ - nova-tox-functional-py38 - nova-multi-cell - nova-next + - nova-tox-validate-backport - nova-ceph-multistore: irrelevant-files: *dsvm-irrelevant-files - neutron-tempest-linuxbridge: diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh index 5ca6ded203..5a449c520b 100755 --- a/tools/check-cherry-picks.sh +++ b/tools/check-cherry-picks.sh @@ -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. @@ -49,8 +49,6 @@ commands = description = Run style checks. envdir = {toxworkdir}/shared -passenv = - DISABLE_CHERRY_PICK_CHECK commands = {[testenv:mypy]commands} bash tools/flake8wrap.sh {posargs} @@ -58,7 +56,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 = @@ -67,6 +64,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. |