Rebased from upstream and reduced some customized commits for xenapi.

README.rst

@@ -140,9 +140,8 @@ By comparison, a provider settings file for HPCloud::
 
 Note: The image regularly changes as new images are uploaded, for the
 specific image name currently used for tests, see
-`nodepool.yaml.erb <http://git.openstack.org/cgit/openstack-infra/
-system-config/tree/modules/openstack_project/templates/nodepool/
-nodepool.yaml.erb>`_.
+`nodepool.yaml <http://git.openstack.org/cgit/openstack-infra/
+project-config/tree/nodepool/nodepool.yaml>`_.
 
 Source the provider settings, boot a server named "testserver" (chosen
 arbitrarily for this example) with your SSH key allowed, and log into
@@ -252,4 +251,8 @@ You can file bugs on the storyboard devstack-gate project::
 
     https://storyboard.openstack.org/#!/project/712
 
-And you can chat with us on Freenode in #openstack-dev or #openstack-infra.
+And you can chat with us on Freenode in #openstack-qa or #openstack-infra.
+
+It's worth noting that, while devstack-gate is generally licensed under the
+Apache license, `playbooks/plugins/callback/devstack.py` is GPLv3 due to having
+derived from the Ansible source code.

features.yaml

@@ -1,10 +1,11 @@
 config:
   default:
-    master: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
+    master: [default, ceilometer, glance, horizon, nova, placement, swift, cinder, keystone]
+    ocata: [default, ceilometer, glance, horizon, nova, placement, swift, cinder, keystone]
+    newton: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
+    mitaka: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
     liberty: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
     kilo: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    juno: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    icehouse: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
     # This can be used by functional jobs that only want their dependencies installed
     # and don't need to incur the overhead of installing all services in the process.
     no_services: [default]
@@ -15,7 +16,7 @@ config:
     features: [postgresql]
   # feature changes for different test matrixes
   grenade:
-    rm-features: [trove, sahara, neutron-adv]
+    rm-features: [trove, sahara, neutron-adv, horizon]
   tempest:
     features: [tempest]
   # feature changes for different configs of existing services
@@ -43,17 +44,23 @@ config:
     features: [ceph]
   heat:
     features: [heat]
+  tlsproxy:
+    features: [tlsproxy]
+  cinder_mn_grenade:
+    features: [cinder-mn-grenade]
+  neutron_dvr:
+    features: [neutron-dvr]
 
 branches:
   # The value of ""default" is the name of the "trunk" branch
   default: master
-  # Normalized branch names only here, e.g. stable/icehouse => icehouse
-  allowed: [master, liberty, kilo, juno, icehouse]
+  # Normalized branch names only here, e.g. stable/ocata => ocata
+  allowed: [master, ocata, newton, mitaka, liberty, kilo]
 
-features:
+primary:
   default:
     base:
-      services: [mysql, rabbit, dstat]
+      services: [mysql, rabbit, dstat, peakmem_tracker]
 
   ceilometer:
     base:
@@ -73,9 +80,7 @@ features:
 
   nova:
     base:
-      services: [n-api, n-cond, n-cpu, n-crt, n-net, n-obj, n-sch]
-    icehouse:
-      compute-ext:
+      services: [n-api, n-cauth, n-cond, n-cpu, n-crt, n-net, n-novnc, n-obj, n-sch]
 
   nova-md:
     base:
@@ -86,18 +91,29 @@ features:
       services: [n-cell]
       rm-compute-ext: [agregates, hosts]
 
+  placement:
+    base:
+      services: [placement-api]
+
   neutron:
     base:
-      services: [quantum, q-svc, q-agt, q-dhcp, q-l3, q-meta, q-metering]
+      services: [q-svc, q-agt, q-dhcp, q-l3, q-meta, q-metering]
       rm-services: [n-net]
 
   neutron-adv:
     base:
-      services: [q-lbaas, q-fwaas]
       rm-services: [n-net]
+    mitaka:
+      services: [q-lbaas]
+    liberty:
+      services: [q-lbaas]
     kilo:
       services: [q-vpn]
 
+  neutron-dvr:
+    base:
+      services: []
+
   swift:
     base:
       services: [s-proxy, s-account, s-container, s-object]
@@ -106,6 +122,12 @@ features:
     base:
       services: [cinder, c-api, c-vol, c-sch, c-bak]
 
+  # This will be used to disable c-vol on primary node when running multinode grenade
+  # job that will test compatibility of new c-api, c-sch (primary) and old c-vol and c-bak (sub).
+  cinder-mn-grenade:
+    base:
+      rm-services: [c-vol, c-bak]
+
   heat:
     base:
       services: [heat, h-api, h-api-cfn, h-api-cw, h-eng]
@@ -154,3 +176,89 @@ features:
   ceph:
     base:
       services: [ceph]
+
+  tlsproxy:
+    base:
+      services: [tls-proxy]
+    # TLS proxy didn't work properly until ocata
+    liberty:
+      rm-services: [tls-proxy]
+    mitaka:
+      rm-services: [tls-proxy]
+    newton:
+      rm-services: [tls-proxy]
+
+subnode:
+  default:
+    base:
+      services: [dstat, peakmem_tracker]
+
+  ceilometer:
+    base:
+      services: [ceilometer-acompute]
+
+  cinder:
+    base:
+      services: [c-vol, c-bak]
+
+  cinder-mn-grenade:
+    base:
+      services: []
+
+  glance:
+    base:
+      services: []
+
+  horizon:
+    base:
+      services: []
+
+  ironic:
+    base:
+      rm-services: [c-vol, c-bak]
+      services: [ir-api, ir-cond]
+
+  keystone:
+    base:
+      services: []
+
+  neutron:
+    base:
+      rm-services: [n-net, n-api-meta]
+      services: [q-agt]
+
+  neutron-adv:
+    base:
+      services: []
+
+  neutron-dvr:
+    base:
+      rm-services: [n-net, n-api-meta]
+      services: [q-agt, q-l3, q-meta]
+
+  nova:
+    base:
+      services: [n-cpu, n-net, n-api-meta]
+
+  placement:
+    base:
+      services: [placement-client]
+
+  swift:
+    base:
+      services: []
+
+  tempest:
+    base:
+      services: []
+
+  tlsproxy:
+    base:
+      services: [tls-proxy]
+    # TLS proxy didn't work properly until ocata
+    liberty:
+      rm-services: [tls-proxy]
+    mitaka:
+      rm-services: [tls-proxy]
+    newton:
+      rm-services: [tls-proxy]