@@ -120,46 +120,46 @@

         # Ignore any default set by devstack. Emit a "disable_all_services".

         base: false

       zuul_copy_output:

-        '{{ devstack_conf_dir }}/local.conf': 'logs'

-        '{{ devstack_conf_dir }}/localrc': 'logs'

-        '{{ devstack_conf_dir }}/.localrc.auto': 'logs'

-        '{{ devstack_conf_dir }}/.stackenv': 'logs'

-        '{{ devstack_log_dir }}/dstat-csv.log': 'logs'

-        '{{ devstack_log_dir }}/devstacklog.txt': 'logs'

-        '{{ devstack_log_dir }}/devstacklog.txt.summary': 'logs'

-        '{{ devstack_full_log}}': 'logs'

-        '{{ stage_dir }}/verify_tempest_conf.log': 'logs'

-        '{{ stage_dir }}/apache': 'logs'

-        '{{ stage_dir }}/apache_config': 'logs'

-        '{{ stage_dir }}/etc': 'logs'

-        '/var/log/rabbitmq': 'logs'

-        '/var/log/postgresql': 'logs'

-        '/var/log/mysql.err': 'logs'

-        '/var/log/mysql.log': 'logs'

-        '/var/log/libvirt': 'logs'

-        '/etc/sudoers': 'logs'

-        '/etc/sudoers.d': 'logs'

-        '{{ stage_dir }}/iptables.txt': 'logs'

-        '{{ stage_dir }}/df.txt': 'logs'

-        '{{ stage_dir }}/pip2-freeze.txt': 'logs'

-        '{{ stage_dir }}/pip3-freeze.txt': 'logs'

-        '{{ stage_dir }}/dpkg-l.txt': 'logs'

-        '{{ stage_dir }}/rpm-qa.txt': 'logs'

-        '{{ stage_dir }}/core': 'logs'

-        '{{ stage_dir }}/listen53.txt': 'logs'

-        '{{ stage_dir }}/deprecations.log': 'logs'

-        '/var/log/ceph': 'logs'

-        '/var/log/openvswitch': 'logs'

-        '/var/log/glusterfs': 'logs'

-        '/etc/glusterfs/glusterd.vol': 'logs'

-        '/etc/resolv.conf': 'logs'

-        '/var/log/unbound.log': 'logs'

+        '{{ devstack_conf_dir }}/local.conf': logs

+        '{{ devstack_conf_dir }}/localrc': logs

+        '{{ devstack_conf_dir }}/.localrc.auto': logs

+        '{{ devstack_conf_dir }}/.stackenv': logs

+        '{{ devstack_log_dir }}/dstat-csv.log': logs

+        '{{ devstack_log_dir }}/devstacklog.txt': logs

+        '{{ devstack_log_dir }}/devstacklog.txt.summary': logs

+        '{{ devstack_full_log}}': logs

+        '{{ stage_dir }}/verify_tempest_conf.log': logs

+        '{{ stage_dir }}/apache': logs

+        '{{ stage_dir }}/apache_config': logs

+        '{{ stage_dir }}/etc': logs

+        /var/log/rabbitmq: logs

+        /var/log/postgresql: logs

+        /var/log/mysql.err: logs

+        /var/log/mysql.log: logs

+        /var/log/libvirt: logs

+        /etc/sudoers: logs

+        /etc/sudoers.d: logs

+        '{{ stage_dir }}/iptables.txt': logs

+        '{{ stage_dir }}/df.txt': logs

+        '{{ stage_dir }}/pip2-freeze.txt': logs

+        '{{ stage_dir }}/pip3-freeze.txt': logs

+        '{{ stage_dir }}/dpkg-l.txt': logs

+        '{{ stage_dir }}/rpm-qa.txt': logs

+        '{{ stage_dir }}/core': logs

+        '{{ stage_dir }}/listen53.txt': logs

+        '{{ stage_dir }}/deprecations.log': logs

+        /var/log/ceph: logs

+        /var/log/openvswitch: logs

+        /var/log/glusterfs: logs

+        /etc/glusterfs/glusterd.vol: logs

+        /etc/resolv.conf: logs

+        /var/log/unbound.log: logs

       extensions_to_txt:

-        conf: True

-        log: True

-        localrc: True

-        stackenv: True

-        auto: True

+        conf: true

+        log: true

+        localrc: true

+        stackenv: true

+        auto: true

     group-vars:

       subnode:

         devstack_localrc:

@@ -207,7 +207,7 @@

         # Multinode specific settings

         SERVICE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"

         HOST_IP: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"

-        PUBLIC_BRIDGE_MTU: "{{ external_bridge_mtu }}"

+        PUBLIC_BRIDGE_MTU: '{{ external_bridge_mtu }}'

       devstack_services:

         # Shared services

         dstat: true

@@ -225,7 +225,7 @@

           # Multinode specific settings

           HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"

           SERVICE_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"

-          PUBLIC_BRIDGE_MTU: "{{ external_bridge_mtu }}"

+          PUBLIC_BRIDGE_MTU: '{{ external_bridge_mtu }}'

           # Subnode specific settings

           DATABASE_TYPE: mysql

           RABBIT_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"

@@ -274,7 +274,7 @@

         SWIFT_START_ALL_SERVICES: false

         SWIFT_HASH: 1234123412341234

         CINDER_PERIODIC_INTERVAL: 10

-        DEBUG_LIBVIRT_COREDUMPS: True

+        DEBUG_LIBVIRT_COREDUMPS: true

         NOVA_VNC_ENABLED: true

         VNCSERVER_LISTEN: 0.0.0.0

         VNCSERVER_PROXYCLIENT_ADDRESS: $HOST_IP

@@ -282,7 +282,7 @@

         post-config:

           $NEUTRON_CONF:

             DEFAULT:

-              global_physnet_mtu: "{{ external_bridge_mtu }}"

+              global_physnet_mtu: '{{ external_bridge_mtu }}'

       devstack_services:

         # Core services enabled for this branch.

         # This list replaces the test-matrix.

@@ -479,6 +479,10 @@

     run: playbooks/unit-tests/run.yaml

 - project:

+    templates:

+      - integrated-gate

+      - integrated-gate-py35

+      - publish-openstack-sphinx-docs

     check:

       jobs:

         - devstack

@@ -488,10 +492,48 @@

         - devstack-platform-fedora-latest

         - devstack-multinode

         - devstack-unit-tests

+        - openstack-tox-bashate

+        - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa:

+            voting: false

+        - legacy-swift-dsvm-functional:

+            voting: false

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-grenade:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-grenade-multinode:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-tempest-linuxbridge:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - tempest-multinode-full:

+            voting: false

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

     gate:

       jobs:

         - devstack

         - devstack-unit-tests

+        - openstack-tox-bashate

+        - neutron-grenade-multinode:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-tempest-linuxbridge:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-grenade:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

     # Please add a note on each job and conditions for the job not

     # being experimental any more, so we can keep this list somewhat

     # pruned.

@@ -520,4 +562,39 @@

         - nova-next

         - neutron-fullstack-with-uwsgi

         - neutron-functional-with-uwsgi

-        - neutron-tempest-with-uwsgi

\ No newline at end of file

+        - neutron-tempest-with-uwsgi

+        - legacy-tempest-dsvm-full-devstack-plugin-ceph:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - legacy-tempest-dsvm-py35-full-devstack-plugin-ceph:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-tempest-dvr:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - legacy-tempest-dsvm-neutron-dvr-multinode-full:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - neutron-tempest-dvr-ha-multinode-full:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - legacy-tempest-dsvm-lvm-multibackend:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+        - legacy-tempest-dsvm-neutron-pg-full:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+    periodic:

+      jobs:

+        - legacy-periodic-tempest-dsvm-oslo-latest-full-master:

+            irrelevant-files:

+              - ^.*\.rst$

+              - ^doc/.*$

+