Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

diff --combined jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 8534b230b75a21472d8b9bf7f1a0eb34ed05dbf6,61b562eb07de271b0970bc4e524cd50e3c343ebe..c368819001c838084b782778a6e05d582519bf85
--- 1/jjb/netvirt/netvirt-csit-multi-openstack.yaml
--- 2/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@@ -1,68 -1,4 +1,68 @@@
  ---
 +- project:
 +    name: netvirt-csit-openstack-integration-fluorine
 +    jobs:
 +      - inttest-csit-openstack
 +
 +    project: 'netvirt'
 +    stream: 'fluorine'
 +    branch: 'master'
 +    testplan: '{project}-{topology}-openstack.txt'
 +    odl-ml2-driver-version: 'v2'
 +    enable-openstack-services: 'placement-api,tempest'
 +    enable-openstack-compute-services: 'placement-client'
 +    security-group-mode: 'stateful'
 +    odl_system_flavor: v2-standard-8
 +    openstack_system_flavor: v2-standard-8
 +    openstack_system2_flavor: v2-standard-4
 +
 +    topology:
 +      - 1node:
 +          openstack_system2_count: 2
 +          odl_system_count: 1
 +          enable-haproxy: 'no'
 +          install-features: 'odl-netvirt-openstack'
 +      - 3node:
 +          openstack_system2_count: 3
 +          odl_system_count: 3
 +          enable-haproxy: 'yes'
 +          install-features: 'odl-jolokia,odl-netvirt-openstack'
 +
 +    functionality:
 +      - upstream-stateful
 +      - upstream-stateful-snat-conntrack:
 +          odl-snat-mode: 'conntrack'
 +      - gate-stateful
 +      - gate-stateful-snat-conntrack:
 +          odl-snat-mode: 'conntrack'
 +      - gate-minimal-cluster:
 +          testplan: '{project}-{topology}-minimal-openstack.txt'
 +      # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
 +      - gate-tdd-wip:
 +          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
 +          schedule: ''
 +
 +    openstack:
 +      - ocata:
 +          openstack-branch: 'stable/ocata'
 +          odl-ml2-branch: 'stable/ocata'
 +          openstack_system_image: '{openstack_system_image_ocata}'
 +          openstack_system2_image: '{openstack_system_image_ocata}'
 +          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
 +      - pike:
 +          openstack-branch: 'stable/pike'
 +          odl-ml2-branch: 'stable/pike'
 +          odl-ml2-port-binding: 'pseudo-agentdb-binding'
 +          openstack_system_image: '{openstack_system_image_pike}'
 +          openstack_system2_image: '{openstack_system_image_pike}'
 +          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
 +      - queens:
 +          openstack-branch: 'master'
 +          odl-ml2-branch: 'master'
 +          odl-ml2-port-binding: 'pseudo-agentdb-binding'
 +          openstack_system_image: '{openstack_system_image_pike}'
 +          openstack_system2_image: '{openstack_system_image_pike}'
 +
  - project:
      name: netvirt-csit-openstack-integration-oxygen
      jobs:
@@@ -70,7 -6,7 +70,7 @@@
  
      project: 'netvirt'
      stream: 'oxygen'
 -    branch: 'master'
 +    branch: 'stable/oxygen'
      testplan: '{project}-{topology}-openstack.txt'
      odl-ml2-driver-version: 'v2'
      enable-openstack-services: 'placement-api,tempest'
@@@ -85,7 -21,7 +85,7 @@@
            openstack_system2_count: 2
            odl_system_count: 1
            enable-haproxy: 'no'
-           install-features: 'odl-mdsal-trace,odl-netvirt-openstack'
+           install-features: 'odl-netvirt-openstack'
        - 3node:
            openstack_system2_count: 3
            odl_system_count: 3