Merge "jenkins job networking odl v2"

diff --combined jjb/integration/integration-templates.yaml
index 10a7e6d02cc79dd13a9dbb51e8ac2ea2f3e8e072,a516a988107e8c7178b2335f469ff0d110e840bb..c48a183770805b50b75116eef693c44b9f6d1dd4
--- 1/jjb/integration/integration-templates.yaml
--- 2/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@@ -328,110 -328,6 +328,110 @@@
                  inclusion-flag: 'off'
                  display-table: true
                  format: csv
 +          - title: '{03-plot-title}'
 +            yaxis: '{03-plot-yaxis}'
 +            group: '{03-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
 +            series:
 +              - file: '{03-plot-data-file}'
 +                inclusion-flag: '{03-inclusion-flag}'
 +                exclude: '{03-exclude-value}'
 +                format: csv
 +          - title: '{04-plot-title}'
 +            yaxis: '{04-plot-yaxis}'
 +            group: '{04-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
 +            series:
 +              - file: '{04-plot-data-file}'
 +                inclusion-flag: '{04-inclusion-flag}'
 +                exclude: '{04-exclude-value}'
 +                format: csv
 +          - title: '{05-plot-title}'
 +            yaxis: '{05-plot-yaxis}'
 +            group: '{05-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
 +            series:
 +              - file: '{05-plot-data-file}'
 +                inclusion-flag: '{05-inclusion-flag}'
 +                exclude: '{05-exclude-value}'
 +                format: csv
 +          - title: '{06-plot-title}'
 +            yaxis: '{06-plot-yaxis}'
 +            group: '{06-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
 +            series:
 +              - file: '{06-plot-data-file}'
 +                inclusion-flag: '{06-inclusion-flag}'
 +                exclude: '{06-exclude-value}'
 +                format: csv
 +          - title: '{07-plot-title}'
 +            yaxis: '{07-plot-yaxis}'
 +            group: '{07-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
 +            series:
 +              - file: '{07-plot-data-file}'
 +                inclusion-flag: '{07-inclusion-flag}'
 +                exclude: '{07-exclude-value}'
 +                format: csv
 +          - title: '{08-plot-title}'
 +            yaxis: '{08-plot-yaxis}'
 +            group: '{08-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
 +            series:
 +              - file: '{08-plot-data-file}'
 +                inclusion-flag: '{08-inclusion-flag}'
 +                exclude: '{08-exclude-value}'
 +                format: csv
 +          - title: '{09-plot-title}'
 +            yaxis: '{09-plot-yaxis}'
 +            group: '{09-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
 +            series:
 +              - file: '{09-plot-data-file}'
 +                inclusion-flag: '{09-inclusion-flag}'
 +                exclude: '{09-exclude-value}'
 +                format: csv
 +          - title: '{10-plot-title}'
 +            yaxis: '{10-plot-yaxis}'
 +            group: '{10-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
 +            series:
 +              - file: '{10-plot-data-file}'
 +                inclusion-flag: '{10-inclusion-flag}'
 +                exclude: '{10-exclude-value}'
 +                format: csv
          - integration-csit-archive-build
          - opendaylight-infra-shiplogs:
              maven-version: 'mvn33'
@@@ -833,7 -729,7 +833,7 @@@
            - title: '{01-plot-title}'
              yaxis: '{01-plot-yaxis}'
              group: '{01-plot-group}'
 -            num-builds: '5400'
 +            num-builds: '180'
              keep-records: true
              style: line
              use-description: false
@@@ -846,7 -742,7 +846,7 @@@
            - title: '{02-plot-title}'
              yaxis: '{02-plot-yaxis}'
              group: '{02-plot-group}'
 -            num-builds: '5400'
 +            num-builds: '180'
              keep-records: true
              style: line
              use-description: false
@@@ -856,110 -752,6 +856,110 @@@
                  inclusion-flag: 'off'
                  display-table: true
                  format: csv
 +          - title: '{03-plot-title}'
 +            yaxis: '{03-plot-yaxis}'
 +            group: '{03-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
 +            series:
 +              - file: '{03-plot-data-file}'
 +                inclusion-flag: '{03-inclusion-flag}'
 +                exclude: '{03-exclude-value}'
 +                format: csv
 +          - title: '{04-plot-title}'
 +            yaxis: '{04-plot-yaxis}'
 +            group: '{04-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
 +            series:
 +              - file: '{04-plot-data-file}'
 +                inclusion-flag: '{04-inclusion-flag}'
 +                exclude: '{04-exclude-value}'
 +                format: csv
 +          - title: '{05-plot-title}'
 +            yaxis: '{05-plot-yaxis}'
 +            group: '{05-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
 +            series:
 +              - file: '{05-plot-data-file}'
 +                inclusion-flag: '{05-inclusion-flag}'
 +                exclude: '{05-exclude-value}'
 +                format: csv
 +          - title: '{06-plot-title}'
 +            yaxis: '{06-plot-yaxis}'
 +            group: '{06-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
 +            series:
 +              - file: '{06-plot-data-file}'
 +                inclusion-flag: '{06-inclusion-flag}'
 +                exclude: '{06-exclude-value}'
 +                format: csv
 +          - title: '{07-plot-title}'
 +            yaxis: '{07-plot-yaxis}'
 +            group: '{07-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
 +            series:
 +              - file: '{07-plot-data-file}'
 +                inclusion-flag: '{07-inclusion-flag}'
 +                exclude: '{07-exclude-value}'
 +                format: csv
 +          - title: '{08-plot-title}'
 +            yaxis: '{08-plot-yaxis}'
 +            group: '{08-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
 +            series:
 +              - file: '{08-plot-data-file}'
 +                inclusion-flag: '{08-inclusion-flag}'
 +                exclude: '{08-exclude-value}'
 +                format: csv
 +          - title: '{09-plot-title}'
 +            yaxis: '{09-plot-yaxis}'
 +            group: '{09-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
 +            series:
 +              - file: '{09-plot-data-file}'
 +                inclusion-flag: '{09-inclusion-flag}'
 +                exclude: '{09-exclude-value}'
 +                format: csv
 +          - title: '{10-plot-title}'
 +            yaxis: '{10-plot-yaxis}'
 +            group: '{10-plot-group}'
 +            num-builds: '180'
 +            keep-records: true
 +            style: line
 +            use-description: false
 +            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
 +            series:
 +              - file: '{10-plot-data-file}'
 +                inclusion-flag: '{10-inclusion-flag}'
 +                exclude: '{10-exclude-value}'
 +                format: csv
          - integration-csit-archive-build
          - opendaylight-infra-shiplogs:
              maven-version: 'mvn33'
@@@ -1003,12 -795,16 +1003,16 @@@
              description: 'Openstack version to use with devstack'
          - string:
              name: ODL_ML2_DRIVER_REPO
 -            default: 'https://github.com/openstack/networking-odl'
 +            default: '{odl-ml2-driver-repo}'
              description: 'URL to fetch networking-odl driver'
          - string:
-             name: ODL_ML2_VERSION
-             default: '{odl-ml2-version}'
+             name: ODL_ML2_BRANCH
+             default: '{odl-ml2-branch}'
              description: 'Version of networking-odl to checkout from the repo'
+         - string:
+             name: ODL_ML2_DRIVER_VERSION
+             default: '{odl-ml2-driver-version}'
+             description: 'Mode of networking-odl (v1 or v2)'
          - string:
              name: ODL_ENABLE_L3_FWD
              default: '{odl-enable-l3}'
@@@ -1117,12 -913,16 +1121,16 @@@
              description: 'Openstack version to use with devstack'
          - string:
              name: ODL_ML2_DRIVER_REPO
 -            default: 'https://github.com/openstack/networking-odl'
 +            default: '{odl-ml2-driver-repo}'
              description: 'URL to fetch networking-odl driver'
          - string:
-             name: ODL_ML2_VERSION
-             default: '{odl-ml2-version}'
+             name: ODL_ML2_BRANCH
+             default: '{odl-ml2-branch}'
              description: 'Version of networking-odl to checkout from the repo'
+         - string:
+             name: ODL_ML2_DRIVER_VERSION
+             default: '{odl-ml2-driver-version}'
+             description: 'Mode of networking-odl (v1 or v2)'
          - string:
              name: ODL_ENABLE_L3_FWD
              default: '{odl-enable-l3}'