diff --git a/jenkins/jobs/api-jobs.yaml b/jenkins/jobs/api-jobs.yaml
index 303695454f..31d2c60da8 100644
--- a/jenkins/jobs/api-jobs.yaml
+++ b/jenkins/jobs/api-jobs.yaml
@@ -39,6 +39,11 @@
           source: 'publish-docs/api-ref/**'
           target: '/'
           remove-prefix: 'publish-docs/api-ref/'
+      - ftp:
+          site: developer.openstack.org
+          source: 'swagger/**'
+          target: 'draft/swagger/'
+          remove-prefix: 'swagger/'
 
 - job:
     name: openstack-api-ref-publish-lang
@@ -59,6 +64,21 @@
           target: '/'
           remove-prefix: 'publish-docs/api-ref/'
 
+- job:
+    name: gate-build-swagger
+    description: Build and publish draft Swagger files from WADL migration.
+    node: bare-trusty
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+      - tox:
+          envlist: 'makeswagger'
+
+    publishers:
+      - console-log
+      - upload-swagger-draft
+
 - job:
     name: gate-compute-api-guide
     description: Build and draft the Compute API Guide from nova source.
diff --git a/jenkins/jobs/macros.yaml b/jenkins/jobs/macros.yaml
index 0b902ba1db..d7ffcbd740 100644
--- a/jenkins/jobs/macros.yaml
+++ b/jenkins/jobs/macros.yaml
@@ -910,6 +910,17 @@
               keep-hierarchy: true
               copy-after-failure: true
 
+- publisher:
+    name: upload-swagger-draft
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'docs-draft/$LOG_PATH'
+              source: 'swagger/**'
+              keep-hierarchy: true
+              copy-after-failure: true
+
 - publisher:
     name: upload-releasenotes-draft
     publishers:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 571ab8cfe7..4438d7c3db 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3836,8 +3836,10 @@ projects:
       - name: openstack-doc-translation
     check:
       - gate-api-site-tox-checklang
+      - gate-build-swagger
     gate:
       - gate-api-site-tox-checklang
+      - gate-build-swagger
     post:
       - api-site-upstream-translation-update
       - openstack-api-ref