diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-15 06:46:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-15 06:46:25 +0000 |
| commit | b8174ece4d49775807826a54b7115e2a66f61cdd (patch) | |
| tree | 3a4ac2d21d05aa863715531c29fa50aa89df63f5 | |
| parent | c0a36d917794fed77e75ba9ed853c01a77b540bd (diff) | |
| parent | de94f429474713a68d5efc53677bc468f02dc112 (diff) | |
| download | nova-b8174ece4d49775807826a54b7115e2a66f61cdd.tar.gz | |
Merge "Move 'check-cherry-picks' test to gate, n-v check" into stable/train
| -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 f80a9eba22..70ecef6e90 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -119,6 +119,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: nova-dsvm-multinode-base description: | @@ -393,6 +404,8 @@ - nova-next - nova-tox-functional - nova-tox-functional-py36 + - nova-tox-validate-backport: + voting: false - tempest-integrated-compute: irrelevant-files: *dsvm-irrelevant-files - tempest-slow-py3: @@ -409,6 +422,7 @@ - nova-tox-functional-py36 - nova-multi-cell - nova-next + - nova-tox-validate-backport - tempest-integrated-compute: irrelevant-files: *dsvm-irrelevant-files - tempest-slow-py3: 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. @@ -51,15 +51,12 @@ commands = description = Run style checks. envdir = {toxworkdir}/shared -passenv = - DISABLE_CHERRY_PICK_CHECK commands = bash tools/flake8wrap.sh {posargs} # Check that all JSON files don't have \r\n in line. 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 = @@ -68,6 +65,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] # TODO(melwitt): This can be removed when functional tests are gating with # python 3.x |