Merge "Update settings for sahara-scenario"

gerritbot/channels.yaml

@@ -1109,6 +1109,7 @@ openstack-merges:
     - openstack/sahara-dashboard
     - openstack/sahara-extra
     - openstack/sahara-image-elements
+    - openstack/sahara-scenario
     - openstack/swift
     - openstack/swift-bench
     - openstack/tempest
@@ -1444,6 +1445,7 @@ openstack-sahara:
     - openstack/sahara-dashboard
     - openstack/sahara-extra
     - openstack/sahara-image-elements
+    - openstack/sahara-scenario
     - openstack/sahara-specs
   branches:
     - master

jenkins/jobs/projects.yaml

@@ -6788,9 +6788,10 @@
 - project:
     name: sahara-scenario
     node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
 
     jobs:
-      - gate-{name}-pep8
+      - python-jobs
 
 - project:
     name: sahara-specs

zuul/layout.yaml

@@ -8916,14 +8916,10 @@ projects:
     post:
       - sahara-image-elements-branch-tarball
 
-# TODO: add docs
   - name: openstack/sahara-scenario
     template:
       - name: merge-check
-    check:
-      - gate-sahara-scenario-pep8
-    gate:
-      - gate-sahara-scenario-pep8
+      - name: python-jobs
 
   - name: openstack/sahara-specs
     template: