Merge "Add openstack-salt project and jobs"

accessbot/channels.yaml

@@ -175,6 +175,7 @@ channels:
   - name: openstack-release
   - name: openstack-rpm-packaging
   - name: openstack-sahara
+  - name: openstack-salt
   - name: openstack-scalpels
   - name: openstack-sdks
   - name: openstack-security

gerrit/acls/openstack/openstack-salt.config

@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group openstack-salt-core
+create = group openstack-salt-release
+label-Code-Review = -2..+2 group openstack-salt-core
+label-Workflow = -1..+1 group openstack-salt-core
+
+[access "refs/tags/*"]
+pushSignedTag = group openstack-salt-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true

gerrit/projects.yaml

@@ -2326,6 +2326,18 @@
   description: Planet RSS Feed for OpenStack
 - project: openstack/openstack-resource-agents
   description: Pacemaker High Availability resource agents for OpenStack
+- project: openstack/openstack-salt
+  description: Salt formulas for deploying OpenStack.
+  upstream: https://github.com/tcpcloud/openstack-salt.git
+  groups:
+    - openstack-salt
+- project: openstack/openstack-salt-specs
+  description: Design Specifications for OpenStack-Salt
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/openstack-salt-specs.git
+  groups:
+    - openstack-salt
+  docimpact-group: openstack-salt
 - project: openstack/openstack-specs
   description: OpenStack wide specs, run by the TC
 - project: openstack/openstack-user-stories
@@ -2945,6 +2957,60 @@
   groups:
     - sahara
   description: Sahara Specifications
+- project: openstack/salt-formula-ceilometer
+  description: Ceilometer salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-ceilometer.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-cinder
+  description: Cinder salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-cinder.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-glance
+  description: Glance salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-glance.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-heat
+  description: Heat salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-heat.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-horizon
+  description: Horizon salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-horizon.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-keystone
+  description: Keystone salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-keystone.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-neutron
+  description: Neutron salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-neutron.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-nova
+  description: Nova salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-nova.git
+  groups:
+    - openstack-salt
+- project: openstack/salt-formula-opencontrail
+  description: OpenContrail salt formula
+  acl-config: /home/gerrit2/acls/openstack/openstack-salt.config
+  upstream: https://github.com/tcpcloud/salt-formula-opencontrail.git
+  groups:
+    - openstack-salt
 - project: openstack/scalpels
   description: Digging and Tracing system for OpenStack
 - project: openstack/searchlight

gerritbot/channels.yaml

@@ -1487,6 +1487,26 @@ openstack-sahara:
     - stable/kilo
     - stable/juno
 
+openstack-salt:
+  events:
+    - patchset-created
+    - change-merged
+    - x-vrif-minus-2
+  projects:
+    - openstack/openstack-salt
+    - openstack/openstack-salt-specs
+    - openstack/salt-formula-ceilometer
+    - openstack/salt-formula-cinder
+    - openstack/salt-formula-glance
+    - openstack/salt-formula-heat
+    - openstack/salt-formula-horizon
+    - openstack/salt-formula-keystone
+    - openstack/salt-formula-neutron
+    - openstack/salt-formula-nova
+    - openstack/salt-formula-opencontrail
+  branches:
+    - master
+
 openstack-scalpels:
   events:
     - patchset-created

jenkins/jobs/macros.yaml

@@ -359,6 +359,22 @@
           #!/bin/bash -xe
           ansible-lint **/*.yml
 
+- builder:
+    name: salt-check-commit
+    builders:
+      - shell: |
+          #!/bin/bash -xe
+          scripts/gate-check-commit.sh
+
+- builder:
+    name: salt-formula-test
+    builders:
+      - shell: |
+          #!/bin/bash -xe
+          [[ $SALT_VERSION == "latest" ]] && export SALT_VERSION=""
+          cd tests
+          ./run_tests.sh
+
 - builder:
     name: ruby-191-prep
     builders:

jenkins/jobs/projects.yaml

@@ -3977,6 +3977,20 @@
       - manual-translation-jobs
       - translation-jobs-liberty
 
+- project:
+    name: openstack-salt
+    node: bare-trusty
+
+    jobs:
+      - 'gate-{name}-pep8'
+
+- project:
+    name: openstack-salt-specs
+    node: bare-trusty
+
+    jobs:
+      - specs-jobs
+
 - project:
     name: openstack-specs
     node: bare-trusty
@@ -7076,6 +7090,69 @@
     jobs:
       - specs-jobs
 
+- project:
+    name: salt-formula-ceilometer
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-cinder
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-glance
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-heat
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-horizon
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-keystone
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-neutron
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-nova
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
+- project:
+    name: salt-formula-opencontrail
+    node: bare-trusty
+
+    jobs:
+      - salt-formula-jobs
+
 - project:
     name: scalpels
     node: bare-trusty

jenkins/jobs/salt-formula-jobs.yaml

@@ -0,0 +1,16 @@
+
+- job-template:
+    name: 'gate-{name}-salt-lint'
+    node: '{node}'
+
+    builders:
+      - gerrit-git-prep
+      - salt-formula-test
+
+    publishers:
+      - console-log
+
+- job-group:
+    name: 'salt-formula-jobs'
+    jobs:
+      - 'gate-{name}-salt-lint'

zuul/layout.yaml

@@ -698,6 +698,12 @@ project-templates:
     experimental-tripleo:
       - gate-tripleo-ci-f22-nonha
 
+  - name: salt-formula-jobs
+    check:
+      - 'gate-{name}-salt-lint'
+    gate:
+      - 'gate-{name}-salt-lint'
+
   - name: javascript-jobs
     check:
       - gate-{name}-npm-run-lint
@@ -7280,6 +7286,16 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
+  - name: openstack/openstack-salt
+    template:
+      - name: merge-check
+      - name: noop-jobs
+
+  - name: openstack/openstack-salt-specs
+    template:
+      - name: merge-check
+      - name: stackforge-specs-jobs
+
   - name: openstack/openstack-specs
     template:
       - name: merge-check
@@ -9254,6 +9270,51 @@ projects:
     gate:
       - gate-sahara-specs-python27
 
+  - name: openstack/salt-formula-ceilometer
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-cinder
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-glance
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-heat
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-horizon
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-keystone
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-neutron
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-nova
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
+  - name: openstack/salt-formula-opencontrail
+    template:
+      - name: merge-check
+      - name: salt-formula-jobs
+
   - name: openstack/scalpels
     template:
       - name: merge-check