diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml
index b2480ab0b3..75d6fb2b27 100644
--- a/jenkins/jobs/sahara.yaml
+++ b/jenkins/jobs/sahara.yaml
@@ -22,6 +22,66 @@
       - console-log
 
 
+- builder:
+    name: sahara-extra-build
+    builders:
+      - link-logs
+      - shell: |
+          #!/bin/bash -xe
+          tools/build-all-artifacts.sh
+
+
+- publisher:
+    name: sahara-extra-publish
+    publishers:
+      - scp:
+          site: 'tarballs.openstack.org'
+          files:
+            - source: 'dist/**'
+              target: 'tarballs/sahara/'
+              keep-hierarchy: true
+              copy-after-failure: false
+
+
+- job:
+    name: 'check-sahara-extra-artifacts'
+    node: 'bare-precise || bare-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - gerrit-git-prep
+      - sahara-extra-build
+
+    publishers:
+      - console-log
+
+
+- job:
+    name: 'gate-sahara-extra-artifacts'
+    node: 'bare-precise || bare-trusty'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - gerrit-git-prep
+      - sahara-extra-build
+
+    publishers:
+      - console-log
+      - sahara-extra-publish
+
+
 - job-template:
     name: '{pipeline}-saharaclient-dsvm-functional{branch-designator}'
     node: '{node}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a853c6127c..2e3919228e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -807,6 +807,9 @@ jobs:
   - name: ^gate-sahara-buildimages.*$
     branch: ^master$
     voting: false
+  - name: ^(gate|check)-sahara-extra-artifacts$
+    branch: ^(?!stable/(icehouse|juno|kilo)).*$
+    voting: false
   - name: gate-kite-python34
     voting: false
   - name: ^(gate|check)-tempest-master
@@ -3112,6 +3115,7 @@ projects:
       - name: check-requirements
     check:
       - gate-sahara-extra-pep8
+      - check-sahara-extra-artifacts
     gate:
       - gate-sahara-extra-pep8
     post: