diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 264aec7900..49bfd0a4b0 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -8086,6 +8086,7 @@
 
     jobs:
       - ansible-role-jobs
+      - windmill-jobs
       - hook-{name}-rtfd
 
 - project:
diff --git a/jenkins/jobs/windmill.yaml b/jenkins/jobs/windmill.yaml
new file mode 100644
index 0000000000..01c0e42877
--- /dev/null
+++ b/jenkins/jobs/windmill.yaml
@@ -0,0 +1,39 @@
+- job-template:
+    name: '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}'
+    node: 'devstack-{ostype}'
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - zuul-git-prep
+      - shell: |
+          # Allow Jenkins user to ssh into localhost
+          ssh-keygen -f ~/.ssh/id_rsa -N ""
+          cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+          ssh-keyscan localhost >> ~/.ssh/known_hosts
+          ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
+      - tox:
+          envlist: "{scenario}"
+
+    publishers:
+      - zuul-swift-upload-console-log
+
+- job-group:
+    name: 'windmill-jobs'
+    jobs:
+      - '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}':
+          job-suffix: '-nv'
+          ostype:
+            - centos7
+            - trusty
+          pipeline: gate
+          scenario:
+            - deploy
+      - '{pipeline}-windmill-{scenario}-{ostype}{job-suffix}':
+          job-suffix: ''
+          ostype:
+            - centos7
+            - trusty
+          pipeline: gate
+          scenario:
+            - deploy
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e24bff522d..571ab8cfe7 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -717,6 +717,27 @@ project-templates:
       - '{name}-npm-publish-tarball':
         - '{name}-npm-upload'
 
+  - name: windmill-jobs-centos7
+    check:
+      - 'gate-windmill-deploy-centos7'
+    gate:
+      - 'gate-windmill-deploy-centos7'
+
+  - name: windmill-jobs-centos7-nv
+    check:
+      - 'gate-windmill-deploy-centos7-nv'
+
+  - name: windmill-jobs-trusty
+    check:
+      - 'gate-windmill-deploy-trusty'
+    gate:
+      - 'gate-windmill-deploy-trusty'
+
+  - name: windmill-jobs-trusty-nv
+    check:
+      - 'gate-windmill-deploy-trusty-nv'
+
+
 jobs:
   - name: ^.*$
     parameter-function: set_node_options
@@ -10284,6 +10305,8 @@ projects:
       - name: merge-check
       - name: ansible-role-jobs
       - name: docs-on-rtfd
+      - name: windmill-jobs-centos7-nv
+      - name: windmill-jobs-trusty-nv
 
   - name: openstack/wsme
     template: