Merge "Conditionally skip some heat gate jobs"

zuul/layout.yaml

@@ -647,7 +647,7 @@ jobs:
   # Skip these long-running and expensive devstack jobs when the
   # change is only to documentation, unit tests or similar components
   # that won't be exercised by the job anyway.
-  - name: ^.*(devstack|tempest|grenade|rally|swift|neutron-lbaas|ironic-inspector)-dsvm.*$
+  - name: ^.*(devstack|tempest|grenade|rally|swift|neutron-lbaas|ironic-inspector|heat)-dsvm.*$
     skip-if:
       - project: ^openstack/neutron$
         all-files-match-any:
@@ -685,6 +685,13 @@ jobs:
           - ^doc/.*$
           - ^ironic_inspector/test/.*$
           - ^tox.ini$
+      # In heat, ^tox.ini and some scripts in ^tools/ are used
+      # in heat-dsvm-functional gates, so not skipping on those changes
+      - project: ^openstack/heat$
+        all-files-match-any:
+          - ^.*\.rst$
+          - ^doc/.*$
+          - ^heat/tests/.*$
       - project: ^openstack/tempest$
         all-files-match-any:
           - ^.*\.rst$
@@ -719,6 +726,14 @@ jobs:
         all-files-match-any:
           - ^.*\.rst$
           - ^doc/.*$
+  # Skip non-doc jobs for doc-only heat changes. Since doc/source/*
+  # is checked by heat-pep8, this job should not be skipped
+  - name: ^.*heat-(python27|python34)$
+    skip-if:
+      - project: ^openstack/heat$
+        all-files-match-any:
+          - ^.*\.rst$
+          - ^doc/.*$
   # Skip non-doc jobs for doc-only ironic changes. Since documents are checked
   # by ironic-pep8 it should not be skipped.
   - name: ^.*ironic-(python27|python34)$