Merge "Move 'check-cherry-picks' test to gate, n-v check" into stable/ussuri

3 files changed, 23 insertions, 8 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 2ec47a6f30..c5df8beb16 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -79,6 +79,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: |
@@ -400,6 +411,8 @@
         - nova-multi-cell
         - nova-next
         - nova-tox-functional-py36
+        - nova-tox-validate-backport:
+            voting: false
         - tempest-integrated-compute:
             # NOTE(gmann): Policies changes do not need to run all the
             # integration test jobs. Running only tempest and grenade
@@ -434,6 +447,7 @@
         - nova-tox-functional-py36
         - nova-multi-cell
         - nova-next
+        - nova-tox-validate-backport
         - tempest-integrated-compute:
             irrelevant-files: *policies-irrelevant-files
         - nova-grenade-multinode:
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.
diff --git a/tox.ini b/tox.ini
index cad163ee3f..e5d0e45446 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,15 +42,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 =
@@ -59,6 +56,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.