Merge "Fix library verify job"

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
new file mode 100644 (file)
index 0000000..1c0407f
--- /dev/null
+++ b/jjb/daexim/daexim.yaml
@@ -0,0 +1,38 @@
+- project:
+    name: daexim-carbon
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    project: 'daexim'
+    project-name: 'daexim'
+    stream: carbon
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
+    mvn-settings: 'daexim-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
+- project:
+    name: daexim-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'daexim'
+    project-name: 'daexim'
+    branch: 'master'
+    mvn-settings: 'daexim-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index a87bc589df51c755ac2f96e57da9e67c709c5bfd..2fbc2f14c3d8245f5f2119f7cd0bd35f9cce0c94 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -19,8 +19,8 @@
     feature:
         - legacy:
             csit-list: >
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream}
-
+                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-csit-1node-openstack-basic-only-{stream}
         - current:
             csit-list: >
                 netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
@@ -28,4 +28,5 @@
         - all:
             csit-list: >
                 netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream},
-                netvirt-csit-1node-openstack-mitaka-openstack-{stream}
+                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-csit-1node-openstack-basic-only-{stream}

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
index 3431514b24dde66f2e9ab0bc3f16ce7d28941c40..0cbce891404d99f2184138d9aa79789b089cedd5 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-old.yaml
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
@@ -29,7 +29,11 @@
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of switch links'
+    01-plot-title: 'Maxmum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
+    01-plot-group: 'Link Scalability'
     01-plot-data-file: 'links.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Link Scalability'
+    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
index b9b9f3475effc32c1b9f10760b998c835c94f415..de2506766b73d514b459579011f1acae637e3e1a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
@@ -23,16 +23,23 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (daily)
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of switch links'
+    01-plot-title: 'Maximum Links Full Mesh Topology'
     01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
+    01-plot-group: 'Link Scalability'
     01-plot-data-file: 'links.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Link Scalability'
+    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
index 46073b52ff950ff5c0c2e232fcf9fca8309139ce..be18e675ee390f408146d897f4658b2a80cb9c48 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity-old.yaml
@@ -24,7 +24,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
+    robot-options: '-v TEST_LENGTH:23h'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
index c34ee5be818bd5848139f43e5919b985fa063e04..3475cafc70b758176042cec9e43e36de7a3422f3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml
@@ -24,10 +24,13 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
+    robot-options: '-v TEST_LENGTH:23h'
+
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
 
     # Trigger jobs (daily)
     schedule: 'H H * * *'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
deleted file mode 100644 (file)
index 2f9a5ef..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-old.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:100'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
deleted file mode 100644 (file)
index 6859a1f..0000000
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:500 -v STEP_SWITCHES:50'
-
-    # mininet image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
index 53c4d574b56088b37a78c8390497b9ffbd355afd..e9b87608a495c047af2f68d22457704c98095192 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-old.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-sw-scalability-daily-old
+    name: openflowplugin-csit-scalability-daily-old
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -20,7 +20,7 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
@@ -29,7 +29,11 @@
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
+    01-plot-title: 'Maximum Switches Linear Topology'
+    01-plot-yaxis: 'Switches'
+    01-plot-group: 'Switch Scalability'
+    01-plot-data-file: 'switches.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Switch Scalability'
+    02-plot-data-file: 'time.csv'

diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
index 40d609c08d71602396528093b82b4c3750869b6c..be35738caf915ae9e145e78c4caaa4e89bf39a96 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-sw-scalability-daily
+    name: openflowplugin-csit-scalability-daily
     jobs:
         - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 
@@ -23,16 +23,23 @@
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
 
+    # mininet image
+    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
+
     # Trigger jobs (daily)
     schedule: 'H H * * *'
 
     # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
+    01-plot-title: 'Maximum Switches Linear Topology'
+    01-plot-yaxis: 'Switches'
+    01-plot-group: 'Switch Scalability'
+    01-plot-data-file: 'switches.csv'
+    02-plot-title: 'Topology Discover Time'
+    02-plot-yaxis: 'Seconds'
+    02-plot-group: 'Switch Scalability'
+    02-plot-data-file: 'time.csv'