Merge "Updates to Chef OpenStack project"

gerritbot/channels.yaml

@@ -493,10 +493,9 @@ openstack-chef:
     - openstack/openstack-chef-specs
   branches:
     - master
-    - stable/juno
-    - stable/kilo
-    - stable/liberty
     - stable/mitaka
+    - stable/newton
+    - stable/ocata
 
 openstack-cinder:
   events:

jenkins/jobs/chef-jobs.yaml

@@ -74,5 +74,4 @@
       - gate-{name}-chef-rake-integration-{node}-nv:
           node:
             - centos-7
-            - ubuntu-trusty
             - ubuntu-xenial

jenkins/jobs/projects.yaml

@@ -8990,7 +8990,6 @@
       - periodic-{name}-chef-rake-integration-{node}:
           node:
             - centos-7
-            - ubuntu-trusty
             - ubuntu-xenial
 
 - project:

zuul/layout.yaml

@@ -786,7 +786,6 @@ project-templates:
     check:
       - 'gate-{name}-chef-rake'
       - 'gate-{name}-chef-rake-integration-centos-7-nv'
-      - 'gate-{name}-chef-rake-integration-ubuntu-trusty-nv'
       - 'gate-{name}-chef-rake-integration-ubuntu-xenial-nv'
     gate:
       - 'gate-{name}-chef-rake'
@@ -13839,7 +13838,6 @@ projects:
       - name: chef-rake-jobs
     periodic:
       - periodic-openstack-chef-repo-chef-rake-integration-centos-7
-      - periodic-openstack-chef-repo-chef-rake-integration-ubuntu-trusty
       - periodic-openstack-chef-repo-chef-rake-integration-ubuntu-xenial
 
   - name: openstack/openstack-chef-specs