Merge "Use bindep for manual jobs"

jenkins/jobs/api-jobs.yaml

@@ -1,26 +1,3 @@
-- job-template:
-    name: '{name}-tox-doc-{envlist}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - revoke-sudo
-      - gerrit-git-prep
-      - tox:
-          envlist: '{envlist}'
-
-    publishers:
-      - console-log
-      - upload-to-docs-site
-      - upload-doc-build-results
-
-    node: '{node}'
-
 - job:
     name: openstack-api-ref
     node: bare-trusty

jenkins/jobs/manuals-jobs.yaml

@@ -14,30 +14,6 @@
 
 - job-template:
     name: 'gate-{name}-tox-doc-publish-{envlist}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - revoke-sudo
-      - gerrit-git-prep
-      - tox:
-          envlist: '{envlist}'
-      - assert-no-extra-files
-
-    publishers:
-      - console-log
-      - upload-docs-draft
-      - upload-doc-build-results
-
-    node: '{node}'
-
-- job-template:
-    name: 'gate-{name}-tox-doc-publish-{envlist}-bindep'
     node: ubuntu-trusty
 
     wrappers:
@@ -60,29 +36,42 @@
       - upload-docs-draft
       - upload-doc-build-results
 
+- job-template:
+    name: '{name}-tox-doc-{envlist}'
+    node: ubuntu-trusty
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - gerrit-git-prep
+      - install-distro-packages
+      - revoke-sudo
+      - tox:
+          envlist: '{envlist}'
+
+    publishers:
+      - console-log
+      - upload-to-docs-site
+      - upload-doc-build-results
+
+
 - job-group:
     name: openstack-doc-jobs
     jobs:
-      - gate-{name}-tox-{envlist}:
+      - gate-{name}-tox-nodb-{envlist}:
           envlist: checklinks
-      - gate-{name}-tox-{envlist}:
+      - gate-{name}-tox-nodb-{envlist}:
           envlist: checkniceness
-      - gate-{name}-tox-{envlist}:
+      - gate-{name}-tox-nodb-{envlist}:
           envlist: checksyntax
-      - gate-{name}-tox-{envlist}:
+      - gate-{name}-tox-nodb-{envlist}:
           envlist: checkdeletions
       - gate-{name}-tox-doc-publish-{envlist}:
           envlist: checkbuild
       - '{name}-tox-doc-{envlist}':
           envlist: publishdocs
-      # Experimental bindep jobs
-      - gate-{name}-tox-{envlist}-bindep:
-          envlist: checklinks
-      - gate-{name}-tox-{envlist}-bindep:
-          envlist: checkniceness
-      - gate-{name}-tox-{envlist}-bindep:
-          envlist: checksyntax
-      - gate-{name}-tox-{envlist}-bindep:
-          envlist: checkdeletions
-      - gate-{name}-tox-doc-publish-{envlist}-bindep:
-          envlist: checkbuild

jenkins/jobs/python-jobs.yaml

@@ -352,6 +352,31 @@
 
     node: '{node}'
 
+- job-template:
+    name: 'gate-{name}-tox-nodb-{envlist}'
+    description: 'Same job as gate-{name}-tox-{envlist} but using bindep and not setting up databases.'
+    node: ubuntu-trusty
+
+    wrappers:
+      - build-timeout:
+          timeout: 40
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - zuul-git-prep-upper-constraints
+      - install-distro-packages
+      - revoke-sudo
+      - tox:
+          envlist: '{envlist}'
+      - assert-no-extra-files
+
+    publishers:
+      - test-results
+      - console-log
+      - zuul-swift-test-results-with-console
+
 - job-template:
     name: '{name}-tarball'
     node: bare-trusty

zuul/layout.yaml

@@ -453,25 +453,25 @@ project-templates:
   # DocBook XML and RST files.
   - name: openstack-doc-gate
     check:
-      - gate-{name}-tox-checklinks
-      - gate-{name}-tox-checkniceness
-      - gate-{name}-tox-checksyntax
-      - gate-{name}-tox-checkdeletions
+      - gate-{name}-tox-nodb-checklinks
+      - gate-{name}-tox-nodb-checkniceness
+      - gate-{name}-tox-nodb-checksyntax
+      - gate-{name}-tox-nodb-checkdeletions
       - gate-{name}-tox-doc-publish-checkbuild
     gate:
-      - gate-{name}-tox-checkniceness
-      - gate-{name}-tox-checksyntax
-      - gate-{name}-tox-checkdeletions
+      - gate-{name}-tox-nodb-checkniceness
+      - gate-{name}-tox-nodb-checksyntax
+      - gate-{name}-tox-nodb-checkdeletions
       - gate-{name}-tox-doc-publish-checkbuild
 
   # Used for building documentation projects that contain
   # only RST files.
   - name: openstack-doc-rst-gate
     check:
-      - gate-{name}-tox-checkniceness
+      - gate-{name}-tox-nodb-checkniceness
       - gate-{name}-tox-doc-publish-checkbuild
     gate:
-      - gate-{name}-tox-checkniceness
+      - gate-{name}-tox-nodb-checkniceness
       - gate-{name}-tox-doc-publish-checkbuild
 
   - name: openstack-doc-translation
@@ -709,14 +709,6 @@ project-templates:
       - gate-{name}-docs-bindep
       - gate-{name}-requirements-bindep
 
-  - name: experimental-docu-bindep-jobs
-    experimental:
-      - gate-{name}-tox-checklinks-bindep
-      - gate-{name}-tox-checkniceness-bindep
-      - gate-{name}-tox-checksyntax-bindep
-      - gate-{name}-tox-checkdeletions-bindep
-      - gate-{name}-tox-doc-publish-checkbuild-bindep
-
   - name: experimental-tripleo-jobs
     experimental-tripleo:
       - gate-tripleo-ci-f22-nonha
@@ -1548,13 +1540,13 @@ jobs:
       - '^.*\.po$'
       - '^.*\.pot$'
 
-  - name: ^gate-.*-tox-checklinks$
+  - name: ^gate-.*-tox-nodb-checklinks$
     branch: master
     voting: false
     files:
       - '^.*\.xml$'
 
-  - name: ^gate-.*-tox-checksyntax$
+  - name: ^gate-.*-tox-nodb-checksyntax$
     files:
       - '^.*\.ent$'
       - '^.*\.po$'
@@ -2037,7 +2029,7 @@ jobs:
     files:
       - '^apidocs/.*$'
 
-  - name: gate-trove-tox-checklinks
+  - name: gate-trove-tox-nodb-checklinks
     files:
       - '^apidocs/.*$'
 
@@ -4009,7 +4001,6 @@ projects:
       - name: merge-check
       - name: openstack-doc-gate
       - name: openstack-doc-translation
-      - name: experimental-docu-bindep-jobs
     check:
       - gate-api-site-tox-checklang
       - gate-build-swagger
@@ -6037,7 +6028,6 @@ projects:
       - name: merge-check
       - name: openstack-doc-rst-gate
       - name: openstack-doc-translation
-      - name: experimental-docu-bindep-jobs
     post:
       - ha-guide-tox-doc-publishdocs
 
@@ -7818,12 +7808,11 @@ projects:
       - name: openstack-doc-rst-gate
       - name: openstack-doc-translation
       - name: translation-jobs-liberty
-      - name: experimental-docu-bindep-jobs
     check:
-      - gate-openstack-manuals-tox-checklinks
-      - gate-openstack-manuals-tox-checksyntax
+      - gate-openstack-manuals-tox-nodb-checklinks
+      - gate-openstack-manuals-tox-nodb-checksyntax
     gate:
-      - gate-openstack-manuals-tox-checksyntax
+      - gate-openstack-manuals-tox-nodb-checksyntax
     post:
       - openstack-manuals-tox-doc-publishdocs
       - propose-openstack-manuals-updates
@@ -7886,7 +7875,6 @@ projects:
       - name: merge-check
       - name: openstack-doc-gate
       - name: openstack-doc-translation
-      - name: experimental-docu-bindep-jobs
     post:
       - operations-guide-tox-doc-publishdocs
 
@@ -10082,7 +10070,6 @@ projects:
       - name: merge-check
       - name: openstack-doc-rst-gate
       - name: openstack-doc-translation
-      - name: experimental-docu-bindep-jobs
     post:
       - security-doc-tox-doc-publishdocs
 
@@ -10917,7 +10904,7 @@ projects:
       - name: translation-jobs
       - name: release-notes-jobs
     check:
-      - gate-trove-tox-checklinks
+      - gate-trove-tox-nodb-checklinks
       - gate-trove-tox-doc-publish-checkbuild
       - gate-trove-functional-dsvm-mysql
       - gate-tempest-dsvm-trove