Merge "Add multipatch job documentation"

author Sam Hague <shague@redhat.com>

Mon, 5 Feb 2018 15:46:56 +0000 (15:46 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Mon, 5 Feb 2018 15:46:56 +0000 (15:46 +0000)
author Sam Hague <shague@redhat.com>
Mon, 5 Feb 2018 15:46:56 +0000 (15:46 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Mon, 5 Feb 2018 15:46:56 +0000 (15:46 +0000)
diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst

index e24ebbbb2c24449f31b134e52a16d689d4085fd7..af06a9ef9db51b4a1d4a733304c8cde7e46934d3 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -1,6 +1,7 @@
  Following are the list of published images available to be used with Jenkins jobs.
  
  * ZZCI - CentOS 7 - builder - 20180109-0417
+* ZZCI - CentOS 7 - builder - 20180201-2139
  * ZZCI - CentOS 7 - devstack - 20171208-1648
  * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
  * ZZCI - CentOS 7 - devstack-pike - 20171208-1649
diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml

index e6816390ec3e77384a6656ffb362df5fa6143588..0d307f7abf9c46f1fcfd15b8aceba1af929d349b 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -10,13 +10,7 @@
      project: 'aaa'
      project-name: 'aaa'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
@@ -36,13 +30,7 @@
      project: 'aaa'
      project-name: 'aaa'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
@@ -63,13 +51,7 @@
      project-name: 'aaa'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
@@ -87,5 +69,4 @@
      project-name: 'aaa'
      branch: 'master'
      mvn-settings: 'aaa-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml

index 4527fd8e82a46a8e34f6c76e145911827a669e64..da8f9b4432baf51ceb2f8abcbd5f185bd060d90a 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -10,13 +10,7 @@
      project: 'alto'
      project-name: 'alto'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'l2switch-merge-{stream}'
      email-upstream: '[alto] [l2switch]'
@@ -36,13 +30,7 @@
      project: 'alto'
      project-name: 'alto'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'l2switch-merge-{stream}'
      email-upstream: '[alto] [l2switch]'
@@ -63,13 +51,7 @@
      project-name: 'alto'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'l2switch-merge-{stream}'
      email-upstream: '[alto] [l2switch]'
@@ -87,5 +69,4 @@
      project-name: 'alto'
      branch: 'master'
      mvn-settings: 'alto-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml

index 7a9dad82bd555df5753aaff8492340c7e464c295..24207d711819c04c03d664b5f503d205567e4444 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -10,13 +10,7 @@
      project: 'atrium'
      project-name: 'atrium'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[atrium]'
@@ -36,13 +30,7 @@
      project: 'atrium'
      project-name: 'atrium'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[atrium]'
@@ -63,13 +51,7 @@
      project-name: 'atrium'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[atrium]'
@@ -86,5 +68,4 @@
      project-name: 'atrium'
      branch: 'master'
      mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml

index da8da068b937e397a337f8161d561bb3ec7c7e52..2a4168e93da453ec41a6c7c7abb446b2f3ee64df 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -10,16 +10,10 @@
      stream: oxygen
      project: 'bgpcep'
      project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
      build-timeout: 120
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
      dependencies: >
          odlparent-merge-{stream},
@@ -44,16 +38,10 @@
      stream: nitrogen
      project: 'bgpcep'
      project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
      build-timeout: 120
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
      dependencies: >
          odlparent-merge-{stream},
@@ -78,17 +66,11 @@
      stream: carbon
      project: 'bgpcep'
      project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
      build-timeout: 120
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
      dependencies: >
          odlparent-merge-{stream},
@@ -109,8 +91,7 @@
  
      project: 'bgpcep'
      project-name: 'bgpcep'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-8c-8g
      branch: 'master'
      mvn-settings: 'bgpcep-settings'
-    mvn-goals: 'clean -DrepoBuild install javadoc:aggregate'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml

index 98796735d83cc1811c401239df8219a19f4cd89c..3a54e71373756d6ff2e9becf1e5a8d803d8b429d 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -11,13 +11,7 @@
      project-name: 'bier'
      branch: 'master'
      build-timeout: 90
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[bier]'
@@ -37,13 +31,7 @@
      project: 'bier'
      project-name: 'bier'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[bier]'
@@ -64,13 +52,7 @@
      project-name: 'bier'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[bier]'
@@ -88,5 +70,4 @@
      project-name: 'bier'
      branch: 'master'
      mvn-settings: 'bier-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml

index eb31447c670b1ca62a3f5b9f00af3d9de7363c24..bf5f301d19f497694affeaf01edb8fc066bda9fb 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -10,13 +10,7 @@
      project: 'capwap'
      project-name: 'capwap'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[capwap]'
@@ -36,13 +30,7 @@
      project: 'capwap'
      project-name: 'capwap'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[capwap]'
@@ -63,13 +51,7 @@
      project-name: 'capwap'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[capwap]'
@@ -87,5 +69,4 @@
      project-name: 'capwap'
      branch: master
      mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml

index ffc3baa5cd8ad4983250d6c5d41210b36f879ae9..8962ee4826ac05eff8329d57cbfba8736b8926cf 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -10,13 +10,7 @@
      project: 'cardinal'
      project-name: 'cardinal'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
      email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
@@ -36,13 +30,7 @@
      project: 'cardinal'
      project-name: 'cardinal'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
      email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
@@ -63,13 +51,7 @@
      project-name: 'cardinal'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
      email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
@@ -87,5 +69,4 @@
      project-name: 'cardinal'
      branch: 'master'
      mvn-settings: 'cardinal-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml

index bd045cbf8c55a84962180a7b4474e5868d95349e..b96d01da85a96fae69059d4acaedcb7bd9d9d89c 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -10,13 +10,7 @@
      project: 'centinel'
      project-name: 'centinel'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[centinel]'
@@ -36,13 +30,7 @@
      project: 'centinel'
      project-name: 'centinel'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[centinel]'
@@ -63,13 +51,7 @@
      project-name: 'centinel'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[centinel]'
@@ -87,5 +69,4 @@
      project-name: 'centinel'
      branch: master
      mvn-settings: 'centinel-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml

index bda82a85650d2838fb5792f38106569005c47381..4740ba10f4c910c75190b0e15e9bfdc9f9331ba9 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -10,13 +10,7 @@
      project-name: 'coe'
      stream: oxygen
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'coe-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: '[coe] [odlparent] [yangtools] [controller]'
@@ -36,13 +30,7 @@
      project-name: 'coe'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'coe-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: '[coe] [odlparent] [yangtools] [controller]'
@@ -62,13 +50,7 @@
      stream: carbon
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'coe-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: '[coe] [odlparent] [yangtools] [controller]'
@@ -86,5 +68,4 @@
      project-name: 'coe'
      branch: 'master'
      mvn-settings: 'coe-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/controller/controller.yaml b/jjb/controller/controller.yaml

index 78631d214483fa96dcb6bc78a0f827e95912b9ba..79d595d87eca99dd25b832a5378fa9db61621144 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -11,14 +11,10 @@
      project: 'controller'
      project-name: 'controller'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
      mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
      build-timeout: 90
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
      email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
@@ -38,14 +34,11 @@
      project: 'controller'
      project-name: 'controller'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
      mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
      email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
      archive-artifacts: ''
@@ -65,14 +58,11 @@
      project-name: 'controller'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
      mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
      email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
      archive-artifacts: ''
@@ -88,6 +78,7 @@
      project: 'controller'
      project-name: 'controller'
      branch: master
+    build-node: centos7-builder-8c-8g
      mvn-settings: 'controller-settings'
-    mvn-goals: 'clean install -Pintegrationtests,docs'
+    mvn-goals: 'clean deploy -Pintegrationtests,docs'
      mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml

index ae09f245f37c302bc9b671ee58ef95fc3154f17c..dfd6205f1cfdd52d8992845cab6686dc035290bb 100644 (file)
--- a/jjb/coretutorials/coretutorials.yaml
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -9,13 +9,7 @@
      project: 'coretutorials'
      project-name: 'coretutorials'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[coretutorials]'
@@ -35,13 +29,7 @@
      project: 'coretutorials'
      project-name: 'coretutorials'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[coretutorials]'
@@ -62,13 +50,7 @@
      project-name: 'coretutorials'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[coretutorials]'
@@ -87,6 +69,5 @@
      project-name: 'coretutorials'
      branch: master
      mvn-settings: 'coretutorials-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      build-timeout: 120
diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml

index 96ad5278112ede7a88938e7cd14d7c5f13836d9e..49b7f40517ee5617b7fc8e86c7de679e2d1fbafa 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -10,13 +10,7 @@
      project-name: 'daexim'
      stream: oxygen
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
@@ -36,13 +30,7 @@
      project-name: 'daexim'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
@@ -60,5 +48,4 @@
      project-name: 'daexim'
      branch: 'master'
      mvn-settings: 'daexim-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml

index de560eea33235465d9ff932912ee0401e9e7d013..c54a7e8bf86876698b0fd9c8a414335b5e67169f 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -10,13 +10,7 @@
      project: 'didm'
      project-name: 'didm'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[didm]'
@@ -36,13 +30,7 @@
      project: 'didm'
      project-name: 'didm'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[didm]'
@@ -63,13 +51,7 @@
      project-name: 'didm'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[didm]'
@@ -86,5 +68,4 @@
      project-name: 'didm'
      branch: 'master'
      mvn-settings: 'didm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml

index e6ab39ea958f252bd7f08926f074028b235c7baf..fbd47780c894731805a66dc77c61d746601ecd06 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -10,13 +10,7 @@
      project: 'dlux'
      project-name: 'dlux'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install -e'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[dlux] [odlparent]'
@@ -36,13 +30,7 @@
      project: 'dlux'
      project-name: 'dlux'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[dlux] [odlparent]'
@@ -63,13 +51,7 @@
      project-name: 'dlux'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[dlux] [odlparent]'
@@ -86,5 +68,4 @@
      project-name: 'dlux'
      branch: 'master'
      mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml

index 0b479d155aa46de9129f3895dee5c511f3b16238..2eea9a58ab409927529347b3e091822ad85361fd 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -10,13 +10,7 @@
      project-name: 'dluxapps'
      stream: oxygen
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'dluxapps-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: '[dluxapps] [odlparent] [yangtools] [controller]'
@@ -36,13 +30,7 @@
      project-name: 'dluxapps'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'dluxapps-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: '[dluxapps] [odlparent] [yangtools] [controller]'
@@ -63,13 +51,7 @@
      stream: carbon
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'dluxapps-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: '[dluxapps] [odlparent] [yangtools] [controller]'
@@ -87,5 +69,4 @@
      project-name: 'dluxapps'
      branch: 'master'
      mvn-settings: 'dluxapps-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/eman/eman.yaml b/jjb/eman/eman.yaml

index df4f24a342ad23696368115c88cb080152ee1029..e2c75d2e18a66b45b2dffb8274a3a611c11e4023 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -11,13 +11,7 @@
      project: 'eman'
      project-name: 'eman'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[eman]'
@@ -39,13 +33,7 @@
      project: 'eman'
      project-name: 'eman'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[eman]'
@@ -68,13 +56,7 @@
      project-name: 'eman'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[eman]'
@@ -92,5 +74,4 @@
      project-name: 'eman'
      branch: 'master'
      mvn-settings: 'eman-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml

index af7804f42dde5da812191bbcffa6b5567c155ebf..cd16b5827ff7bc98dce24e8208ed2f471d1f1633 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -10,13 +10,7 @@
      project: 'faas'
      project-name: 'faas'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[faas]'
@@ -36,13 +30,7 @@
      project: 'faas'
      project-name: 'faas'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[faas]'
@@ -63,13 +51,7 @@
      project-name: 'faas'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[faas]'
@@ -86,5 +68,4 @@
      project-name: 'faas'
      branch: 'master'
      mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml

index b4180e1b32ee93012aef3dfab9a5cd582fc1a4b7..d680b128fd042eea71019e7f3254429a700deb9b 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -11,13 +11,7 @@
      project-name: 'federation'
      stream: oxygen
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'federation-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: '[federation] [odlparent] [yangtools] [controller]'
@@ -38,13 +32,7 @@
      project-name: 'federation'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'federation-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: '[federation] [odlparent] [yangtools] [controller]'
@@ -66,13 +54,7 @@
      stream: carbon
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'federation-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: '[federation] [odlparent] [yangtools] [controller]'
@@ -90,5 +72,4 @@
      project-name: 'federation'
      branch: 'master'
      mvn-settings: 'federation-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/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml

index a78a197476880a80160c9ad4f7ccd01458898c16..fea7ca0358dc170ed3f8c880b8b274343d3a105f 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -15,6 +15,9 @@
      functionality:
        - 'upstream'
        - 'gate'
+      - 'tdd-wip':
+          testplan: '{project}-tdd-wip.txt'
+          schedule: ''
  
      # Project branches
      stream:
diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml

index 50f22777a9443f6f9589a053042da81eb0bc586f..e0fdf3c451844cbbe8c39676a986eca994e16906 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -38,3 +38,7 @@
        - cluster:
            csit-list: >
                genius-csit-3node-gate-all-{stream}
+
+      - tdd-wip:
+          csit-list: >
+              genius-csit-1node-tdd-wip-all-{stream}
diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml

index a11bd16a71d4b15245a6709c7a227a893f6a3f16..32690ccf80dd4c09a1c8fe15877a476eb40ad5d9 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -11,13 +11,7 @@
      project: 'genius'
      project-name: 'genius'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      build-timeout: 90
      dependencies: >
@@ -43,13 +37,7 @@
      project: 'genius'
      project-name: 'genius'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: >
          controller-merge-{stream},
@@ -75,13 +63,7 @@
      project-name: 'genius'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: >
          controller-merge-{stream},
@@ -103,5 +85,4 @@
      project-name: 'genius'
      branch: 'master'
      mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/global-jjb b/jjb/global-jjb

index a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e..d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e
+Subproject commit d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584
diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml

index dcf6c8ccc73d56e50ac831308f084c95a24c3d0d..b60c2efdfb4e23dafd111c9aba84a5a63ef3dd67 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -10,13 +10,8 @@
      project: 'groupbasedpolicy'
      project-name: 'groupbasedpolicy'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      build-timeout: 90
      dependencies: >
@@ -42,13 +37,8 @@
      project: 'groupbasedpolicy'
      project-name: 'groupbasedpolicy'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: >
          openflowjava-merge-{stream},
@@ -74,13 +64,8 @@
      project-name: 'groupbasedpolicy'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: >
          openflowjava-merge-{stream},
@@ -102,5 +87,5 @@
      project-name: 'groupbasedpolicy'
      branch: 'master'
      mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml

index 157660f36491897981b938f7c899925b4f0d7bdf..4d3c545a3b7f2dde74f864d5cd545d9bf138e51e 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -10,13 +10,7 @@
      project: 'honeycomb/vbd'
      project-name: 'vbd'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[vbd]'
@@ -36,13 +30,7 @@
      project: 'honeycomb/vbd'
      project-name: 'vbd'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[vbd]'
@@ -63,13 +51,7 @@
      project-name: 'vbd'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[vbd]'
@@ -86,5 +68,4 @@
      project-name: 'vbd'
      branch: 'master'
      mvn-settings: 'honeycomb-vbd-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml

index 77fe7e4b34a7da9ddc35aacf5b0ccba4672fa4f9..77dfce7398fb89c2909e57870aa63bea6afff9d5 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -11,13 +11,7 @@
      project: 'infrautils'
      project-name: 'infrautils'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[infrautils] [odlparent]'
@@ -37,13 +31,7 @@
      project: 'infrautils'
      project-name: 'infrautils'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[infrautils] [odlparent]'
@@ -64,13 +52,7 @@
      project-name: 'infrautils'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[infrautils] [odlparent]'
@@ -87,5 +69,4 @@
      project-name: 'infrautils'
      branch: 'master'
      mvn-settings: 'infrautils-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh

index 7e3b3b648eae7f491bfc04e04583ebb1d00b90a6..4b6a313e990ebb2a1550cb886c857a17a56be3fa 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -1,5 +1,9 @@
  #!/bin/bash
  
+echo "common-functions.sh is being sourced"
+
+BUNDLEFOLDER=$1
+
  # Basic controller configuration settings
  export MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
  export FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
@@ -13,12 +17,31 @@ export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
  export MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
  export MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
  
+function print_common_env() {
+    cat << EOF
+common-functions environment:
+MAVENCONF: ${MAVENCONF}
+FEATURESCONF: ${FEATURESCONF}
+CUSTOMPROP: ${CUSTOMPROP}
+LOGCONF: ${LOGCONF}
+MEMCONF: ${MEMCONF}
+CONTROLLERMEM: ${CONTROLLERMEM}
+AKKACONF: ${AKKACONF}
+MODULESCONF: ${MODULESCONF}
+MODULESHARDSCONF: ${MODULESHARDSCONF}
+
+EOF
+}
+print_common_env
+
  # Setup JAVA_HOME and MAX_MEM Value in ODL startup config file
  function set_java_vars() {
+    local JAVA_HOME=$1
  
      echo "Configure java home and max memory..."
-    sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF}
-    sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
+    sed -ie 's%^# export JAVA_HOME%export JAVA_HOME=${JAVA_HOME:-'"${JAVA_HOME}"'}%g' ${MEMCONF}
+    sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM='"${CONTROLLERMEM}"'/g' ${MEMCONF}
+    echo "cat ${MEMCONF}"
      cat ${MEMCONF}
  
      echo "Set Java version"
@@ -30,6 +53,62 @@ function set_java_vars() {
      echo "Set JAVA_HOME"
      export JAVA_HOME="${JAVA_HOME}"
      # shellcheck disable=SC2037
-    JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
-    echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
+    JAVA_RESOLVED=$(readlink -e "${JAVA_HOME}/bin/java")
+    echo "Java binary pointed at by JAVA_HOME: ${JAVA_RESOLVED}"
  } # set_java_vars()
+
+# shellcheck disable=SC2034
+# foo appears unused. Verify it or export it.
+function configure_karaf_log() {
+    local -r karaf_version=$1
+    local -r controllerdebugmap=$2
+    local logapi=log4j
+
+    # Check what the logging.cfg file is using for the logging api: log4j or log4j2
+    grep "log4j2" ${LOGCONF}
+    if [ $? -eq 0 ]; then
+        logapi=log4j2
+    fi
+
+    echo "Configuring the karaf log... karaf_version: ${karaf_version}, logapi: ${logapi}"
+    if [ "${logapi}" == "log4j2" ]; then
+        # FIXME: Make log size limit configurable from build parameter.
+        sed -ie 's/log4j2.appender.rolling.policies.size.size = 16MB/log4j2.appender.rolling.policies.size.size = 1GB/g' ${LOGCONF}
+        orgmodule="org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver"
+        orgmodule_="${orgmodule//./_}"
+        echo "${logapi}.logger.${orgmodule_}.name = WARN" >> ${LOGCONF}
+        echo "${logapi}.logger.${orgmodule_}.level = WARN" >> ${LOGCONF}
+    else
+        sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
+        # FIXME: Make log size limit configurable from build parameter.
+        sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
+        echo "${logapi}.logger.org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver = WARN" >> ${LOGCONF}
+    fi
+
+    # Add custom logging levels
+    # CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
+    # where module is abbreviated and does not include "org.opendaylight."
+    unset IFS
+    echo "controllerdebugmap: ${controllerdebugmap}"
+    if [ -n "${controllerdebugmap}" ]; then
+        for kv in ${controllerdebugmap}; do
+            module="${kv%%:*}"
+            level="${kv#*:}"
+            echo "module: $module, level: $level"
+            # shellcheck disable=SC2157
+            if [ -n "${module}" ] && [ -n "${level}" ]; then
+                orgmodule="org.opendaylight.${module}"
+                if [ "${logapi}" == "log4j2" ]; then
+                    orgmodule_="${orgmodule//./_}"
+                    echo "${logapi}.logger.${orgmodule_}.name = ${orgmodule}" >> ${LOGCONF}
+                    echo "${logapi}.logger.${orgmodule_}.level = ${level}" >> ${LOGCONF}
+                else
+                    echo "${logapi}.logger.${orgmodule} = ${level}" >> ${LOGCONF}
+                fi
+            fi
+        done
+    fi
+
+    echo "cat ${LOGCONF}"
+    cat ${LOGCONF}
+} # function configure_karaf_log()
diff --git a/jjb/integration/copy-common-functions.sh b/jjb/integration/copy-common-functions.sh

new file mode 100644 (file)

index 0000000..e0eacdf
--- /dev/null
+++ b/jjb/integration/copy-common-functions.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copy the whole script to /tmp/common-functions.sh and to remote nodes but
+# only if this script itself is executing and not sourced. jenkins prepends this
+# script to the common-functions.sh script when adding it to the robot minion.
+# jenkins will then execute the script. The if check below checks that the
+# script is executing rather than being sourced. When executed the condition
+# is true and copies the script. In the false path this copy below is skipped
+# and the sourcing continues so that the appended common-function.sh ends up sourced.
+if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
+    echo "Copying common-functions.sh to /tmp"
+    cp "${0}" /tmp/common-functions.sh
+
+    source /tmp/v/openstack/bin/activate
+    mapfile -t ips <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
+    for ip in "${ips[@]}"; do
+        echo "Copying common-functions.sh to ${ip}:/tmp"
+        scp /tmp/common-functions.sh ${ip}:/tmp
+    done
+    exit 0
+fi
diff --git a/jjb/integration/csit-jobs-carbon.lst b/jjb/integration/csit-jobs-carbon.lst

index f53722af3da3aaa1e61f8e04755958ff1400f2e0..a031a144c6344c72a3ba048cc865528ae4fc21e7 100644 (file)
--- a/jjb/integration/csit-jobs-carbon.lst
+++ b/jjb/integration/csit-jobs-carbon.lst
@@ -95,6 +95,6 @@ usc-csit-1node-tcp-all-carbon,
  usecplugin-csit-1node-basic-all-carbon,
  vtn-csit-1node-coordinator-only-carbon,
  vtn-csit-1node-manager-all-carbon,
-vtn-csit-1node-openstack-newton-neutron-carbon,
+vtn-csit-1node-openstack-pike-neutron-carbon,
  vtn-csit-3node-manager-all-carbon,
  yangtools-csit-1node-periodic-system-only-carbon,
diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst

index 9060713ebdfa645dec70d32060dfb3814f058d47..5970628dc96e3005f73ab9e1c1a27da07da40cfa 100644 (file)
--- a/jjb/integration/csit-jobs-nitrogen.lst
+++ b/jjb/integration/csit-jobs-nitrogen.lst
@@ -95,6 +95,6 @@ usc-csit-1node-tcp-all-nitrogen,
  usecplugin-csit-1node-basic-all-nitrogen,
  vtn-csit-1node-coordinator-only-nitrogen,
  vtn-csit-1node-manager-all-nitrogen,
-vtn-csit-1node-openstack-newton-neutron-nitrogen,
+vtn-csit-1node-openstack-pike-neutron-nitrogen,
  vtn-csit-3node-manager-all-nitrogen,
  yangtools-csit-1node-periodic-system-only-nitrogen,
diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst

index 18370940c366dec1ccfc73f2e4d761dfd01bcea1..f39598af45e5b82a752ef6688eff6e16843c7e0b 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -100,6 +100,6 @@ usc-csit-1node-tcp-all-oxygen,
  usecplugin-csit-1node-basic-all-oxygen,
  vtn-csit-1node-coordinator-only-oxygen,
  vtn-csit-1node-manager-all-oxygen,
-vtn-csit-1node-openstack-newton-neutron-oxygen,
+vtn-csit-1node-openstack-pike-neutron-oxygen,
  vtn-csit-3node-manager-all-oxygen,
  yangtools-csit-1node-periodic-system-only-oxygen,
diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml

index ad581a5fca30bab61b5fc85169efbbb6384e5b99..faf15249a3dfcb691db17a048da43d4a136d766a 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -53,7 +53,7 @@
                -Dstream={stream}
                -Dsft.heap.max=4g
                {opendaylight-infra-mvn-opts}
-          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features for SFT.
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
            java-opts:
              - '-Xmx1024m -XX:MaxPermSize=256m'
            settings: integration-settings
@@ -238,14 +238,16 @@
        - distribution-check-wipe
        - distribution-check-build-project:
            pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
        - distribution-check-verify-groupid:
            gerrit-project: 'integration'
        - distribution-check-delete-snapshots
        - distribution-check-configure-remotes
        - distribution-check-repeat-project-build:
            pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
        - integration-set-variables
        - distribution-check-warn-9191
        - distribution-check-warn-9192
diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml

index a4cb1b8f694dc264911b8b0b77468c3e61a8a7bd..b8fb9ec2dc18d92ba8bdb44cc318238b96dcb55f 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -61,21 +61,23 @@
        - distribution-check-build-project:
            pom: '$GERRIT_PROJECT/pom.xml'
            mvn-opts: '{opendaylight-infra-mvn-opts}'
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
        - distribution-check-verify-groupid:
            gerrit-project: '$GERRIT_PROJECT'
        - distribution-check-download-deps:
            dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
        - distribution-check-delete-snapshots
        - distribution-check-configure-remotes
        - distribution-check-repeat-project-build:
            pom: '$GERRIT_PROJECT/pom.xml'
            mvn-opts: '{opendaylight-infra-mvn-opts}'
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
        - distribution-check-repeat-distro-build:
            dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-parallel-mvn-opts}'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
        - integration-set-variables
        - distribution-check-warn-9191
        - distribution-check-warn-9192
diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh

index 5b1db13ec908f13a2ccd58676d2918d611fe6c38..ecc941a5b16ca3eff5d4e84687e4e9a3268f164e 100644 (file)
--- a/jjb/integration/integration-configure-clustering.sh
+++ b/jjb/integration/integration-configure-clustering.sh
@@ -4,6 +4,7 @@
  # script.
  # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
  source ${ROBOT_VENV}/bin/activate
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
  
  echo "#################################################"
  echo "##         Configure Cluster and Start         ##"
@@ -55,6 +56,8 @@ fi
  
  # Create the configuration script to be run on controllers.
  cat > ${WORKSPACE}/configuration-script.sh <<EOF
+set -x
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
  
  echo "Changing to /tmp"
  cd /tmp
@@ -80,32 +83,15 @@ fi
  sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
  cat ${FEATURESCONF}
  
-echo "Configuring the log..."
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
-# FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
-# Add custom logging levels
-# CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
-# where module is abbreviated and does not include org.opendaylight
-unset IFS
-if [ -n "${CONTROLLERDEBUGMAP}" ]; then
-    for kv in ${CONTROLLERDEBUGMAP}; do
-        module=\${kv%%:*}
-        level=\${kv#*:}
-        if [ -n \${module} ] && [ -n \${level} ]; then
-            echo "log4j.logger.org.opendaylight.\${module} = \${level}" >> \${LOGCONF}
-        fi
-    done
-fi
-cat ${LOGCONF}
-
  if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
    echo "Enable the l3.fwd in custom.properties.."
    echo "ovsdb.l3.fwd.enabled=yes" >> ${CUSTOMPROP}
    cat ${CUSTOMPROP}
  fi
  
-set_java_vars
+configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
+
+set_java_vars "${JAVA_HOME}"
  
  # Copy shard file if exists
  if [ -f /tmp/custom_shard_config.txt ]; then
diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh

index c6beeed410da498e9cccb2a5dc1db1b0ee6ab7fd..84fb75517c20ba366f4f5dc172305269af3f85e2 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -4,7 +4,7 @@
  # script.
  # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
  source ${ROBOT_VENV}/bin/activate
-
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
  
  if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
      echo "Configure cluster"
@@ -45,6 +45,8 @@ if [ -f "${WORKSPACE}/test/csit/scriptplans/${TESTPLAN}" ]; then
  fi
  
  cat > ${WORKSPACE}/configuration-script.sh <<EOF
+set -x
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
  
  echo "Changing to /tmp"
  cd /tmp
@@ -78,27 +80,9 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
  fi
  cat ${CUSTOMPROP}
  
-echo "Configuring the log..."
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' ${LOGCONF}
-# FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' ${LOGCONF}
-echo "log4j.logger.org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver = WARN" >> ${LOGCONF}
-# Add custom logging levels
-# CONTROLLERDEBUGMAP is expected to be a key:value map of space separated values like "module:level module2:level2"
-# where module is abbreviated and does not include org.opendaylight
-unset IFS
-if [ -n "${CONTROLLERDEBUGMAP}" ]; then
-    for kv in ${CONTROLLERDEBUGMAP}; do
-        module=\${kv%%:*}
-        level=\${kv#*:}
-        if [ -n \${module} ] && [ -n \${level} ]; then
-            echo "log4j.logger.org.opendaylight.\${module} = \${level}" >> ${LOGCONF}
-        fi
-    done
-fi
-cat ${LOGCONF}
+configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
  
-set_java_vars
+set_java_vars "${JAVA_HOME}"
  
  echo "Listing all open ports on controller system..."
  netstat -pnatu
@@ -126,6 +110,7 @@ if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
  fi
  
  EOF
+# cat > ${WORKSPACE}/configuration-script.sh <<EOF
  
  # Create the startup script to be run on controller.
  cat > ${WORKSPACE}/startup-script.sh <<EOF
@@ -138,6 +123,7 @@ echo "Starting controller..."
  /tmp/${BUNDLEFOLDER}/bin/start
  
  EOF
+# cat > ${WORKSPACE}/startup-script.sh <<EOF
  
  cat > ${WORKSPACE}/post-startup-script.sh <<EOF
  
@@ -217,6 +203,7 @@ exit_on_log_file_message 'BindException: Address already in use'
  exit_on_log_file_message 'server is unhealthy'
  
  EOF
+# cat > ${WORKSPACE}/post-startup-script.sh <<EOF
  
  [ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
  NUM_ODLS_PER_SITE=$((NUM_ODL_SYSTEM / NUM_OPENSTACK_SITES))
diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh

index d413310a92be2adef584261d91668d2d73b2aca2..4dc2ce255daa7a049984e499c1d9b0439bd96087 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -62,6 +62,7 @@ PUBLIC_BRIDGE: ${PUBLIC_BRIDGE}
  ENABLE_HAPROXY_FOR_NEUTRON: ${ENABLE_HAPROXY_FOR_NEUTRON}
  ENABLE_OS_SERVICES: ${ENABLE_OS_SERVICES}
  ENABLE_OS_COMPUTE_SERVICES: ${ENABLE_OS_COMPUTE_SERVICES}
+ENABLE_OS_NETWORK_SERVICES: ${ENABLE_OS_NETWORK_SERVICES}
  ENABLE_OS_PLUGINS: ${ENABLE_OS_PLUGINS}
  DISABLE_OS_SERVICES: ${DISABLE_OS_SERVICES}
  TENANT_NETWORK_TYPE: ${TENANT_NETWORK_TYPE}
@@ -141,12 +142,36 @@ function csv2ssv() {
      echo "${ssv}"
  } # csv2ssv
  
+function is_openstack_feature_enabled() {
+    local feature=$1
+    for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES})
+    do
+        if [ "${enabled_feature}" == "${feature}" ]; then
+           echo 1
+           return
+        fi
+    done
+    echo 0
+}
+
+function fix_libvirt_version_n_cpu_ocata() {
+    local ip=$1
+    ${SSH} ${ip} "
+        cd /opt/stack;
+        git clone https://git.openstack.org/openstack/requirements;
+        cd requirements;
+        git checkout stable/ocata;
+        sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
+   "
+}
+
  # Add enable_services and disable_services to the local.conf
  function add_os_services() {
      local core_services=$1
      local enable_services=$2
      local disable_services=$3
      local local_conf_file_name=$4
+    local enable_network_services=$5
  
      cat >> ${local_conf_file_name} << EOF
  enable_service $(csv2ssv "${core_services}")
@@ -159,6 +184,11 @@ EOF
      if [ -n "${disable_services}" ]; then
          cat >> ${local_conf_file_name} << EOF
  disable_service $(csv2ssv "${disable_services}")
+EOF
+    fi
+    if [ -n "${enable_network_services}" ]; then
+        cat >> ${local_conf_file_name} << EOF
+enable_service $(csv2ssv "${enable_network_services}")
  EOF
      fi
  }
@@ -180,7 +210,7 @@ RECLONE=${RECLONE}
  disable_all_services
  EOF
  
-    add_os_services "${CORE_OS_CONTROL_SERVICES}" "${ENABLE_OS_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}"
+    add_os_services "${CORE_OS_CONTROL_SERVICES}" "${ENABLE_OS_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}" "${ENABLE_OS_NETWORK_SERVICES}"
  
      cat >> ${local_conf_file_name} << EOF
  
@@ -212,6 +242,11 @@ NEUTRON_SFC_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin i
  NEUTRON_FLOWCLASSIFIER_DRIVERS=${ODL_SFC_DRIVER} # Only relevant if networking-sfc plugin is enabled
  ETCD_PORT=2379
  EOF
+    if [ "${TENANT_NETWORK_TYPE}" == "local" ]; then
+        cat >> ${local_conf_file_name} << EOF
+ENABLE_TENANT_TUNNELS=false
+EOF
+    fi
  
      if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
          echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
@@ -533,6 +568,7 @@ EOF
          scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
          ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
          scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        rsync -avhe ssh ${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/etc ${NODE_FOLDER}
          ${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
          ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
          scp ${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar ${NODE_FOLDER}
@@ -650,7 +686,9 @@ EOF
          mkdir -p ${TEMPEST_LOGS_DIR}
          scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR}
          scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR}
-        mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
+        if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "master" ]; then
+           mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
+        fi
      else
          echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0"
      fi
@@ -798,8 +836,6 @@ CORE_OS_CONTROL_SERVICES+=",key"
  CORE_OS_CONTROL_SERVICES+=",n-api,n-api-meta,n-cauth,n-cond,n-crt,n-obj,n-sch"
  # ODL - services to connect to ODL
  CORE_OS_CONTROL_SERVICES+=",odl-compute,odl-neutron"
-# Neutron
-CORE_OS_CONTROL_SERVICES+=",q-dhcp,q-meta,q-svc"
  # Additional services
  CORE_OS_CONTROL_SERVICES+=",mysql,rabbit"
  
@@ -900,7 +936,21 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
      create_etc_hosts ${!CONTROLIP}
      scp ${WORKSPACE}/hosts_file ${!CONTROLIP}:/tmp/hosts
      scp ${WORKSPACE}/get_devstack.sh ${!CONTROLIP}:/tmp
+    # devstack Master is yet to migrate fully to lib/neutron, there are some ugly hacks that is
+    # affecting the stacking.
+    #Workaround For Queens, Make the physical Network as physnet1 in lib/neutron
+    #Workaround Comment out creating initial Networks in lib/neutron
      ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
+    if [ "${ODL_ML2_BRANCH}" == "master" ]; then
+       ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
+       ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
+    fi
+    if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
+        echo "Updating requirements for ${ODL_ML2_BRANCH}"
+        echo "Workaround for https://review.openstack.org/#/c/491032/"
+        echo "Modify upper-constraints to use libvirt-python 3.2.0"
+        fix_libvirt_version_n_cpu_ocata ${!CONTROLIP}
+    fi
      create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
      scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
      echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
@@ -908,11 +958,6 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
      ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
      ssh ${!CONTROLIP} "ls -lrt /opt/stack/devstack/nohup.out"
      os_node_list+=("${!CONTROLIP}")
-    # Workaround for stable/newton jobs
-    # TODO: can this be removed now?
-    if [ "${ODL_ML2_BRANCH}" == "stable/newton" ]; then
-        ssh ${!CONTROLIP} "cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; git checkout stable/newton; sed -i /appdirs/d upper-constraints.txt"
-    fi
  done
  
  # This is a backup to the CELLSV2_SETUP=singleconductor workaround. Keeping it here as an easy lookup
@@ -927,16 +972,18 @@ done
  # AccessRefused: (0, 0): (403) ACCESS_REFUSED - Login was refused using authentication mechanism AMQPLAIN. For details see the broker logfile.
  # Compare that timestamp to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
  # If the n-cpu.log is earlier than the control stack.log timestamp then the failure condition is likely hit.
-WAIT_FOR_RABBITMQ_MINUTES=60
-echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready to allow the controller to create nova_cell1 before the computes need it"
-retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
-rc=$?
-if ((${rc} == 0)); then
-    echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
-else
-    echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
-    collect_logs
-    exit 1
+if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 0 ]; then
+   WAIT_FOR_RABBITMQ_MINUTES=60
+   echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready to allow the controller to create nova_cell1 before the computes need it"
+   retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
+   rc=$?
+   if ((${rc} == 0)); then
+      echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
+   else
+      echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
+      collect_logs
+      exit 1
+   fi
  fi
  
  for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
@@ -955,13 +1002,7 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
          echo "Updating requirements for ${ODL_ML2_BRANCH}"
          echo "Workaround for https://review.openstack.org/#/c/491032/"
          echo "Modify upper-constraints to use libvirt-python 3.2.0"
-        ${SSH} ${!COMPUTEIP} "
-            cd /opt/stack;
-            git clone https://git.openstack.org/openstack/requirements;
-            cd requirements;
-            git checkout stable/ocata;
-            sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
-        "
+        fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
      fi
      create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
      scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
@@ -1272,6 +1313,7 @@ for suite in ${SUITES}; do
      -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} \
      -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \
      -v ODL_SNAT_MODE:${ODL_SNAT_MODE} \
+    -v ODL_ENABLE_L3_FWD:${ODL_ENABLE_L3_FWD} \
      -v ODL_STREAM:${DISTROSTREAM} \
      -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
      -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} \
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml

index 4e2ccf0de917121a68700a164963f25d0c4ba7d0..7f01c570ea7ecdb7dab1e7d64a1b3674be5b81c5 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -374,9 +374,7 @@
  - builder:
      name: integration-deploy-controller-run-test
      builders:
-      - shell: !include-raw:
-          - common-functions.sh
-          - integration-deploy-controller-run-test.sh
+      - shell: !include-raw: integration-deploy-controller-run-test.sh
  
  # Macro: integration-configure-clustering
  # Operation: this macro configures the clustering
@@ -385,9 +383,7 @@
  - builder:
      name: integration-configure-clustering
      builders:
-      - shell: !include-raw:
-          - common-functions.sh
-          - integration-configure-clustering.sh
+      - shell: !include-raw: integration-configure-clustering.sh
  
  # Macro: integration-start-cluster-run-test
  # Operation: this macro starts the 3-node cluster and runs test
@@ -443,10 +439,21 @@
      builders:
        - shell: !include-raw: integration-rebase-gerrit-patch.sh
  
+# Macro: integration-install-common-functions
+# Operation: Copy the common-functions.sh script to csit nodes
+# Used by: {project}-csit-* job templates
+- builder:
+    name: integration-install-common-functions
+    builders:
+      - shell: !include-raw:
+          - copy-common-functions.sh
+          - common-functions.sh
+
  - builder:
      name: integration-deploy-openstack-run-test
      builders:
-      - shell: !include-raw: integration-deploy-openstack-run-test.sh
+      - shell: !include-raw:
+          - integration-deploy-openstack-run-test.sh
  
  - builder:
      name: integration-compare-distributions
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml

index 0c412626acab712b0a942618f0927b30ee2e6713..da9c33863a06243b844c5c2001dd35c30dee8112 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -105,6 +105,7 @@
        - inject:
            properties-file: 'slave_addresses.txt'
        - integration-detect-variables
+      - integration-install-common-functions
        - integration-deploy-controller-run-test
        - integration-cleanup-tmp
  
@@ -197,6 +198,7 @@
        - inject:
            properties-file: 'slave_addresses.txt'
        - integration-detect-variables
+      - integration-install-common-functions
        - integration-deploy-controller-run-test
        - integration-cleanup-tmp
  
@@ -312,6 +314,7 @@
        - inject:
            properties-file: 'slave_addresses.txt'
        - integration-detect-variables
+      - integration-install-common-functions
        - integration-deploy-controller-run-test
        - integration-cleanup-tmp
  
@@ -1120,6 +1123,10 @@
            name: ENABLE_OS_COMPUTE_SERVICES
            default: '{enable-openstack-compute-services}'
            description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
        - string:
            name: ENABLE_OS_PLUGINS
            default: '{enable-openstack-plugins}'
@@ -1200,6 +1207,7 @@
        - inject:
            properties-file: 'slave_addresses.txt'
        - integration-detect-variables
+      - integration-install-common-functions
        - integration-deploy-controller-run-test
        - integration-deploy-openstack-run-test
        - integration-cleanup-tmp
@@ -1320,6 +1328,10 @@
            name: ENABLE_OS_COMPUTE_SERVICES
            default: '{enable-openstack-compute-services}'
            description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
        - string:
            name: ENABLE_OS_PLUGINS
            default: '{enable-openstack-plugins}'
@@ -1402,6 +1414,7 @@
        - inject:
            properties-file: 'slave_addresses.txt'
        - integration-detect-variables
+      - integration-install-common-functions
        - integration-deploy-controller-run-test
        - integration-deploy-openstack-run-test
        - integration-cleanup-tmp
@@ -1500,7 +1513,7 @@
                -DgenerateReports=false
                -Dstream={stream}
                {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
            java-opts:
              - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
            settings: integration-settings
@@ -1514,7 +1527,8 @@
                clean install dependency:tree
                -Pq
                -Dgitid.skip=false
-              {opendaylight-infra-parallel-mvn-opts}
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
            java-opts:
              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
            settings: integration-settings
diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml

index d5c471fb93e7e4875a8df308e023e332e8ad3036..add368112f8daf4bb5f526147681557e8aa09ae2 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -29,7 +29,7 @@
  
        - nitrogen:
            branch: 'stable/nitrogen'
-          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr
+          csit-blacklist: longevity gate sanity capwap centinel coe didm iotdm jsonrpc lacp netide tsdr tdd wip
            csit-list: !include: csit-jobs-nitrogen.lst
            csit-sanity-list: '{csit-sanity-list-nitrogen}'
            csit-weekly-list: '{csit-weekly-list-nitrogen}'
@@ -39,7 +39,7 @@
        - carbon:
            branch: 'stable/carbon'
            karaf-version: karaf3
-          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc
+          csit-blacklist: longevity gate sanity capwap centinel coe jsonrpc tdd wip
            csit-list: !include: csit-jobs-carbon.lst
            csit-sanity-list: '{csit-sanity-list-carbon}'
            csit-weekly-list: '{csit-weekly-list-carbon}'
@@ -192,7 +192,7 @@
                -Pq
                -Dstream={stream}
                {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
            java-opts:
              - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
            settings: integration-settings
@@ -204,7 +204,8 @@
            pom: distribution/pom.xml
            goals: |
                clean install dependency:tree -DoutputFile=dependency_tree.txt
-              {opendaylight-infra-parallel-mvn-opts}
+              {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
            java-opts:
              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
            settings: integration-settings
diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml

index 9539c82841f94e9d11f3b0f159da1fe482e8b641..fab8aa6e047ef015e5f7792a8a8c766070af0e6e 100644 (file)
--- a/jjb/integration/integration4-templates.yaml
+++ b/jjb/integration/integration4-templates.yaml
@@ -69,6 +69,7 @@
        - inject:
            properties-file: 'slave_addresses.txt'
        - integration-detect-variables
+      - integration-install-common-functions
        - integration-deploy-controller-run-test
        - integration-cleanup-tmp
  
diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml

index c2c135ab62735e5858a2e3ffeb331880229e6ad1..bcb999f0012249760092dc07369c3ade07afa052 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -10,13 +10,7 @@
      project: 'iotdm'
      project-name: 'iotdm'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'aaa-merge-{stream}'
      email-upstream: '[iotdm] [aaa]'
@@ -36,13 +30,7 @@
      project: 'iotdm'
      project-name: 'iotdm'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'aaa-merge-{stream}'
      email-upstream: '[iotdm] [aaa]'
@@ -63,13 +51,7 @@
      project-name: 'iotdm'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'aaa-merge-{stream}'
      email-upstream: '[iotdm] [aaa]'
@@ -86,5 +68,4 @@
      project-name: 'iotdm'
      branch: 'master'
      mvn-settings: 'iotdm-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml

index 48cb51f350bfbebd0924e95a8b9872eb1ea91411..aa9d59210ec726b9e8924a36603b2a1f2cf05bab 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -9,13 +9,7 @@
      project-name: 'jsonrpc'
      stream: fluorine
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'jsonrpc-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},mdsal-merge-{stream}'
      email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
@@ -34,13 +28,7 @@
      project-name: 'jsonrpc'
      stream: oxygen
      branch: 'stable/oxygen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'jsonrpc-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},mdsal-merge-{stream}'
      email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
@@ -59,13 +47,7 @@
      project-name: 'jsonrpc'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'jsonrpc-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},mdsal-merge-{stream}'
      email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
@@ -85,13 +67,7 @@
      stream: carbon
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'jsonrpc-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},mdsal-merge-{stream}'
      email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
@@ -109,5 +85,4 @@
      project-name: 'jsonrpc'
      branch: 'master'
      mvn-settings: 'jsonrpc-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/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml

index f203d89595c71d0d66c102419fe58cad0e222e52..3cb1e9378bf555543c2d329b30747bcd4d9875b3 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -10,13 +10,7 @@
      project: 'l2switch'
      project-name: 'l2switch'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: >
          odlparent-merge-{stream},
@@ -41,13 +35,7 @@
      project: 'l2switch'
      project-name: 'l2switch'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: >
          odlparent-merge-{stream},
@@ -73,13 +61,7 @@
      project-name: 'l2switch'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: >
          odlparent-merge-{stream},
@@ -101,5 +83,4 @@
      project-name: 'l2switch'
      branch: 'master'
      mvn-settings: 'l2switch-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml

index 72c8ca70bf451829a1792bb49decbf754aa65a03..194a76145edafe80761174f997aab1f368c21abb 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -10,13 +10,7 @@
      project: 'lacp'
      project-name: 'lacp'
      branch: 'master'
-    jdks:
-      - openjdk8
      mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
      email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -36,13 +30,7 @@
      project: 'lacp'
      project-name: 'lacp'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
      mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
      email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -63,13 +51,7 @@
      project-name: 'lacp'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
      mvn-settings: 'lacp-settings'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
      email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -86,5 +68,4 @@
      project-name: 'lacp'
      branch: 'master'
      mvn-settings: 'lacp-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml

index 582621eeca1d1209d84b9b5fa1673bbfbab1fe71..ef1596ae99cb3c2c6da6bd328e3dcdb1ee506835 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -11,13 +11,8 @@
      project: 'lispflowmapping'
      project-name: 'lispflowmapping'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
      dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
      email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -25,7 +20,7 @@
          **/*.log
          **/target/surefire-reports/*-output.txt
  
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
  
      # Used by the release job
      staging-profile-id: 96fff2503b766
@@ -42,13 +37,8 @@
      project: 'lispflowmapping'
      project-name: 'lispflowmapping'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
      dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
      email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
@@ -56,7 +46,7 @@
          **/*.log
          **/target/surefire-reports/*-output.txt
  
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
  
      # Used by the release job
      staging-profile-id: 96fff2503b766
@@ -74,18 +64,13 @@
      project-name: 'lispflowmapping'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
      dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
      email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
      archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
  
      # Used by the release job
      staging-profile-id: 96fff2503b766
@@ -98,5 +83,5 @@
      project-name: 'lispflowmapping'
      branch: 'master'
      mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild'
+    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml

index 79e498ce1cbdfdbed60c5d9960480f61917722c4..12100b8a8a98b568535969a92cd561a126e199d0 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -11,14 +11,10 @@
      project: 'mdsal'
      project-name: 'mdsal'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    build-node: centos7-builder-8c-8g
      build-timeout: 90
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -39,13 +35,9 @@
      project: 'mdsal'
      project-name: 'mdsal'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-8c-8g
      mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -66,14 +58,10 @@
      project: 'mdsal'
      project-name: 'mdsal'
      branch: 'stable/carbon'
+    build-node: centos7-builder-8c-8g
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -89,6 +77,7 @@
      project: 'mdsal'
      project-name: 'mdsal'
      branch: 'master'
+    build-node: centos7-builder-8c-8g
      mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml

index 5c6f81e309ca3975d3a75881cdd1b079b4aaac7a..4c928c39bfa90852a3e0c40e357175958fe243d7 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -11,13 +11,7 @@
      project: 'messaging4transport'
      project-name: 'messaging4transport'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[messaging4transport]'
@@ -38,13 +32,7 @@
      project: 'messaging4transport'
      project-name: 'messaging4transport'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[messaging4transport]'
@@ -66,13 +54,7 @@
      project-name: 'messaging4transport'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[messaging4transport]'
@@ -89,5 +71,4 @@
      project-name: 'messaging4transport'
      branch: 'master'
      mvn-settings: 'messaging4transport-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml

index 0232969673e10dfa7a017d1429eeee561a0c1211..b40529213b487f29ccf266b67718476a1b667c60 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -11,13 +11,7 @@
      project: 'natapp'
      project-name: 'natapp'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
      email-upstream: '[natapp] [openflowplugin]'
@@ -38,13 +32,7 @@
      project: 'natapp'
      project-name: 'natapp'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
      email-upstream: '[natapp] [openflowplugin]'
@@ -66,13 +54,7 @@
      project-name: 'natapp'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
      email-upstream: '[natapp] [openflowplugin]'
@@ -89,5 +71,4 @@
      project-name: 'natapp'
      branch: 'master'
      mvn-settings: 'natapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml

index 0b37f358eb655b91b30a79b1323b63ca00ea6f31..3a9c047e25cf1d88aa6d9acecb46f07624db53d1 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -10,13 +10,7 @@
      project: 'nemo'
      project-name: 'nemo'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[nemo]'
@@ -36,13 +30,7 @@
      project: 'nemo'
      project-name: 'nemo'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[nemo]'
@@ -63,13 +51,7 @@
      project-name: 'nemo'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[nemo]'
@@ -86,5 +68,4 @@
      project-name: 'nemo'
      branch: 'master'
      mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml

index 806cd5ee7ec880ddcfbd9106ee89a3f734bf785e..026cebb91088ccba7fb703ff233f8f7ee979500f 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -10,13 +10,8 @@
      project: 'netconf'
      project-name: 'netconf'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
      build-timeout: 90
      dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
@@ -37,13 +32,8 @@
      project: 'netconf'
      project-name: 'netconf'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
      dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
@@ -64,13 +54,8 @@
      project-name: 'netconf'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
      dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
@@ -87,5 +72,5 @@
      project-name: 'netconf'
      branch: 'master'
      mvn-settings: 'netconf-settings'
-    mvn-goals: 'clean install -Pintegrationtests'
+    mvn-goals: 'clean deploy -Pintegrationtests'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml

index 318b15c508a821d628ff48df3ed650a429931876..9952388a736a9708ceb5af6f3f47c53a40ca9459 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -10,13 +10,7 @@
      project: 'netide'
      project-name: 'netide'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream}'
      email-upstream: '[netide] [openflowjava]'
@@ -36,13 +30,7 @@
      project: 'netide'
      project-name: 'netide'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream}'
      email-upstream: '[netide] [openflowjava]'
@@ -63,13 +51,7 @@
      project-name: 'netide'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowjava-merge-{stream}'
      email-upstream: '[netide] [openflowjava]'
@@ -86,5 +68,4 @@
      project-name: 'netide'
      branch: 'master'
      mvn-settings: 'netide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml

index 9793e3b2dbcf94381f365a3e76eb7061bac09ca3..a4143f9aadb75bd3cb74871bda3039fb0ff3b411 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -36,12 +36,14 @@
            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'
@@ -98,12 +100,14 @@
            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'
@@ -162,12 +166,14 @@
            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}'
  
      odl-ml2-driver-version: 'v2'
      enable-openstack-services: 'placement-api,l2gw-plugin'
diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml

index 3ecb36e36644b8604d4bc6566a5cc38992647681..93b94f15c5021763c7347c94f864932dc7deafa9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -39,7 +39,7 @@
            testplan: '{project}-{topology}-minimal-openstack.txt'
        # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
        - tdd-wip:
-          testplan: '{project}-{topology}-tdd-wip.txt'
+          testplan: '{project}-{topology}-tdd-wip-openstack.txt'
            schedule: ''
  
      openstack:
@@ -48,12 +48,14 @@
            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'
@@ -106,12 +108,14 @@
            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'
@@ -165,12 +169,14 @@
            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}'
  
  - project:
      name: netvirt-csit-sfc-openstack-integration
@@ -212,3 +218,4 @@
            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}'
diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml

index 846501688c4bcbe947a96b765cbd2b7803039be5..22867d5f7c9385d032294e004011a9314633776a 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -18,16 +18,10 @@
            karaf-version: karaf3
      project: 'netvirt'
      project-name: 'netvirt'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
      build-timeout: 90
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
      dependencies: >
          genius-merge-{stream},
          neutron-merge-{stream},
@@ -52,13 +46,7 @@
      branch: 'topic/vpp'
      karaf-version: karaf3
      distribution_branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
      dependencies:
      email-upstream: '[netvirt]'
@@ -72,5 +60,4 @@
      project-name: 'netvirt'
      branch: 'master'
      mvn-settings: 'netvirt-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml

index 3f3de316aeb5e33e23946ae2411fe65dda34206f..b569802268e5304904aca90d1384ac89e8bb8252 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -12,13 +12,7 @@
      project-name: 'neutron'
      build-timeout: 90
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
      email-upstream: '[neutron] [odlparent] [aaa]'
@@ -40,13 +34,7 @@
      project-name: 'neutron'
      build-timeout: 60
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
      email-upstream: '[neutron] [odlparent] [aaa]'
@@ -69,13 +57,7 @@
      build-timeout: 60
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
      email-upstream: '[neutron] [odlparent] [aaa]'
@@ -92,5 +74,4 @@
      project-name: 'neutron'
      branch: 'master'
      mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml

index 36c1d21e9fe2fa84b043052d120f0015ca00be81..338f2b0379077b6653530292f5045968b53b0b86 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -10,13 +10,7 @@
      project: 'next'
      project-name: 'next'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[next]'
@@ -36,13 +30,7 @@
      project: 'next'
      project-name: 'next'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[next]'
@@ -63,13 +51,7 @@
      project-name: 'next'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'next-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[next]'
@@ -85,6 +67,5 @@
      project: 'next'
      project-name: 'next'
      branch: 'master'
-    mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
+    mvn-settings: 'next-settings'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml

index 0af5510cd60367752d30d7f0b128eaf3f251f169..5ee9a485000c866b2b254d0a331752291dd43068 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -10,13 +10,7 @@
      project: 'nic'
      project-name: 'nic'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
      email-upstream: '[nic] [vtn] [groupbasedpolicy]'
@@ -36,13 +30,7 @@
      project: 'nic'
      project-name: 'nic'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
      email-upstream: '[nic] [vtn] [groupbasedpolicy]'
@@ -63,13 +51,7 @@
      project-name: 'nic'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
      email-upstream: '[nic] [vtn] [groupbasedpolicy]'
@@ -86,5 +68,4 @@
      project-name: 'nic'
      branch: 'master'
      mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml

index 9865f61af49e341334171b1d3d040362fe61bdc3..239fdc64cbf753f87bf9e6edcf75f75d126274f7 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -10,13 +10,7 @@
      project: 'ocpplugin'
      project-name: 'ocpplugin'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
@@ -36,13 +30,7 @@
      project: 'ocpplugin'
      project-name: 'ocpplugin'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
@@ -63,13 +51,7 @@
      project-name: 'ocpplugin'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
@@ -86,5 +68,4 @@
      project-name: 'ocpplugin'
      branch: 'master'
      mvn-settings: 'ocpplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml

index 3a13df042ee2efe81be98b453cfce0059efa7926..46a237a5ce295af0568415698ba102ba92e63f2e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -12,13 +12,7 @@
      branch: master
      distribution_branch: master
  
-    jdks:
-      - openjdk8
-    maven:
-      - mvn35:
-          mvn-version: mvn35
      mvn-settings: odlparent-settings
-    mvn-goals: clean install
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      mvn-version: mvn35
  
@@ -48,15 +42,8 @@
      branch: 3.1.x
      distribution_branch: master
  
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
      mvn-settings: odlparent-settings
-    mvn-goals: clean install
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: ''
      email-upstream: '[odlparent]'
@@ -85,15 +72,8 @@
      branch: 3.0.x
      distribution_branch: master
  
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
      mvn-settings: odlparent-settings
-    mvn-goals: clean install
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: ''
      email-upstream: '[odlparent]'
@@ -122,15 +102,8 @@
      branch: 2.0.x
      distribution_branch: master
  
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: mvn33
      mvn-settings: odlparent-settings
-    mvn-goals: clean install
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: ''
      email-upstream: '[odlparent]'
@@ -160,13 +133,7 @@
      project-name: 'odlparent'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[odlparent]'
@@ -191,5 +158,4 @@
      project-name: 'odlparent'
      branch: 'master'
      mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml

index 7677ec6762530cb9abab13e68763cec4d9fe48f8..b119ff3b2d7f81f4430f072f81e45635799fe584 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -10,13 +10,7 @@
      project: 'of-config'
      project-name: 'of-config'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: netconf-merge-{stream}'
      email-upstream: '[of-config] [netconf]'
@@ -36,13 +30,7 @@
      project: 'of-config'
      project-name: 'of-config'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: netconf-merge-{stream}'
      email-upstream: '[of-config] [netconf]'
@@ -63,13 +51,7 @@
      project-name: 'of-config'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: netconf-merge-{stream}'
      email-upstream: '[of-config] [netconf]'
@@ -86,5 +68,4 @@
      project-name: 'of-config'
      branch: 'master'
      mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml

index 66bfcae955ae94def68574b7a918a826500f8ae1..ab4d336fea6f5a46f649925a928f65d123b61fc8 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -9,13 +9,7 @@
      project: 'ofextensions/circuitsw'
      project-name: 'circuitsw'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[circuitsw]'
@@ -34,13 +28,7 @@
      project: 'ofextensions/circuitsw'
      project-name: 'circuitsw'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[circuitsw]'
@@ -59,13 +47,7 @@
      project: 'ofextensions/circuitsw'
      project-name: 'circuitsw'
      branch: 'stable/carbon'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[circuitsw]'
@@ -82,5 +64,4 @@
      project-name: 'circuitsw'
      branch: 'master'
      mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml

index c2a080e1d8072cd51b7bad095a4bd3ad2bb2d5e6..66561f090af202896281a3cdc1a4645d008667e4 100644 (file)
--- a/jjb/openflowjava/openflowjava.yaml
+++ b/jjb/openflowjava/openflowjava.yaml
@@ -11,13 +11,7 @@
      project: 'openflowjava'
      project-name: 'openflowjava'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
@@ -39,13 +33,7 @@
      project-name: 'openflowjava'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
      email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
@@ -62,5 +50,4 @@
      project-name: 'openflowjava'
      branch: 'master'
      mvn-settings: 'openflowjava-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml

index fcb6ef944e3745d8116e74491be55eb6b22121e6..f3236868905dfeb732795cacbaad999e650b4d7c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -11,13 +11,8 @@
      project: 'openflowplugin'
      project-name: 'openflowplugin'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      build-timeout: 90
      dependencies: >
@@ -43,13 +38,8 @@
      project: 'openflowplugin'
      project-name: 'openflowplugin'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: >
          odlparent-merge-{stream},
@@ -75,13 +65,8 @@
      project-name: 'openflowplugin'
      branch: 'stable/carbon'
      karaf-version: 'karaf3'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: >
          odlparent-merge-{stream},
@@ -102,5 +87,5 @@
      project-name: 'openflowplugin'
      branch: 'master'
      mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean install javadoc:aggregate'
+    mvn-goals: 'clean deploy javadoc:aggregate'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml

index 2e5d81414dfaba3474c0e028eb2ce54f13ad0568..870839d265d6a05cfe305f28892234c53ada9f30 100644 (file)
--- a/jjb/ovil/ovil.yaml
+++ b/jjb/ovil/ovil.yaml
@@ -11,9 +11,7 @@
        - oxygen:
            branch: master
      mvn-settings: ovil-settings
-    mvn-goals: clean install
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: ''
      email-upstream: '[ovil]'
@@ -30,5 +28,4 @@
      project-name: 'ovil'
      branch: 'master'
      mvn-settings: 'ovil-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml

index a87a43b988d7f070f42fdac32520fe331cb48867..c9118a47d681c414fcc4af21eb320e487a93ba3b 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -11,13 +11,7 @@
      project: 'ovsdb'
      project-name: 'ovsdb'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
@@ -38,13 +32,7 @@
      project: 'ovsdb'
      project-name: 'ovsdb'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
@@ -66,13 +54,7 @@
      project-name: 'ovsdb'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml

index 985d6b25e0f08a26c310b15b6662fc21374d1d46..1fd08e53b1033511e31e25273d06cc6b2598e9ac 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -11,13 +11,7 @@
      project: 'p4plugin'
      project-name: 'p4plugin'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'p4plugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[p4plugin]'
@@ -35,5 +29,4 @@
      project-name: 'p4plugin'
      branch: 'master'
      mvn-settings: 'p4plugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml

index afdf9373d5461740474a1bffac1923d8551076f5..893de90b903eb590f186a36944a6e854917635e7 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -10,13 +10,7 @@
      project: 'packetcable'
      project-name: 'packetcable'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[packetcable]'
@@ -36,13 +30,7 @@
      project: 'packetcable'
      project-name: 'packetcable'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[packetcable]'
@@ -63,13 +51,7 @@
      project-name: 'packetcable'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[packetcable]'
@@ -86,5 +68,4 @@
      project-name: 'packetcable'
      branch: 'master'
      mvn-settings: 'packetcable-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml

index d89c48f5b92f4ace7b69b46fda089d38c3f0a05b..1b7254c9c0ae471b73d8d6a6870aa416d1228240 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -10,14 +10,7 @@
      project-name: 'persistence'
      branch: 'master'
      jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[persistence]'
@@ -37,14 +30,7 @@
      project-name: 'persistence'
      branch: 'stable/nitrogen'
      jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[persistence]'
@@ -65,14 +51,7 @@
      branch: 'stable/carbon'
      karaf-version: karaf3
      jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[persistence]'
@@ -89,5 +68,4 @@
      project-name: 'persistence'
      branch: 'master'
      mvn-settings: 'persistence-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml

index 080ace60f9fdf9a4612295190a69c757673838c5..51b9bc8a154d3668257c83b192cdb9b2d288dc9b 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -11,7 +11,7 @@
  
      # Timeout in minutes
      build-timeout: 360
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-4c-4g
      schedule: ''
      schedule-saturday: 'H H * * 6'
      schedule-weekly: 'H 23 * * 6'
@@ -44,6 +44,7 @@
      enable-openstack-plugins: 'networking-odl'
      enable-openstack-services: ''
      enable-openstack-compute-services: ''
+    enable-openstack-network-services: 'neutron,neutron-api,neutron-dhcp,neutron-metadata-agent'
      ipsec-vxlan-tunnels-enabled: 'no'
      lbaas-service-provider: ''
      num-openstack-sites: 1
@@ -56,6 +57,7 @@
      tenant-network-type: 'vxlan'
      odl-sfc-driver: 'odl'
      odl-snat-mode: 'controller'
+    openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
  
      # openstack-infra-parameters defaults
      archive-artifacts: ''
@@ -76,7 +78,7 @@
      docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
      odl_system_count: 1
      odl_system_flavor: v1-performance-2
-    odl_system_image: ZZCI - CentOS 7 - builder - 20180109-0417
+    odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
      openstack_system_count: 1
      openstack_system_flavor: v1-performance-4
      openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml

index 99b39487dcc905abebe8956cb6b9920e3c6dd37b..72007f085080da54d8457d20350b0dd3078203ab 100644 (file)
--- a/jjb/releng-packer-jobs.yaml
+++ b/jjb/releng-packer-jobs.yaml
@@ -12,7 +12,7 @@
      build-node: centos7-builder-2c-1g
      build-timeout: 90
  
-    platforms: centos
+    platforms: centos-7
      templates: builder
  
  - project:
@@ -28,7 +28,7 @@
      build-node: centos7-builder-2c-1g
      build-timeout: 60
  
-    platforms: centos
+    platforms: centos-7
      templates: docker
  
  - project:
@@ -59,5 +59,5 @@
  
      build-node: centos7-builder-2c-1g
  
-    platforms: centos
+    platforms: centos-7
      templates: robot
diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml

index d697e548facaddf53fbe58f9d1859669181a7b09..259ef196073b5628c9bce72103980f8ce92dfcfe 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -14,11 +14,22 @@
  
        - gerrit-maven-release
        - gerrit-maven-verify
-      - gerrit-maven-verify-dependencies
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
  
  - job-template:
      name: '{project-name}-integration-{stream}'
  
+    ######################
+    # Default parameters #
+    ######################
+
+    mvn-goals: clean install
+
+    #####################
+    # Job Configuration #
+    #####################
+
      project-type: freestyle
      node: '{build-node}'
      jdk: '{jdk}'
@@ -73,110 +84,3 @@
        - findbugs
        - lf-jacoco-report
        - lf-infra-publish
-
-- job-template:
-    name: '{project-name}-merge-{stream}'
-
-    # Need to keep jobs that deploy to Nexus at end of build as Maven
-    # projects. Maybe reconsider this once upstream moves deploy to a
-    # separate lifecycle:
-    #     https://issues.apache.org/jira/browse/MNG-5666
-    project-type: maven
-    node: '{build-node}'
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 14
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - string:
-          name: STREAM
-          default: '{stream}'
-          description: "String representing release name"
-
-    scm:
-      - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - timed: 'H H * * 0'
-      - gerrit-trigger-patch-merged:
-          gerrit-server-name: '{gerrit-server-name}'
-          name: '{project}'
-          branch: '{branch}'
-
-    prebuilders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-
-    # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
-    maven:
-      maven-name: 'mvn33'
-      goals: >
-          {mvn-goals}
-          -Dmerge
-          -Dstream={stream}
-          {opendaylight-infra-mvn-opts}
-      maven-opts: '{mvn-opts}'
-      settings: '{mvn-settings}'
-      settings-type: cfp
-      global-settings: 'global-settings'
-      global-settings-type: cfp
-      post-step-run-condition: UNSTABLE
-
-    postbuilders:
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: deploy-site.xml
-          condition-basedir: workspace
-
-          # The strategy here is intentional to run Maven site:deploy twice
-          # once using regular pom.xml to produce a staged-site which is
-          # then used by deploy-site.xml to push to Nexus. This is a
-          # workaround to Maven Site's default linking code which creates
-          # incorrect URLs for sites due to auto-detection assuming your
-          # project is configured in a certain way which ODL is not.
-          steps:
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: pom.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: '{mvn-settings}'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - opendaylight-infra-deploy-maven-site:
-                settings-file: '{mvn-settings}'
-
-    reporters:
-      - findbugs
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - maven-deploy:
-          id: ''
-          unique-version: true
-          deploy-unstable: false
-      - lf-jacoco-report
-      - lf-infra-publish
-      - trigger:
-          project: 'distribution-merge-{stream}'
-          threshold: SUCCESS
diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml

index 1e32c5d215fb6df24902daf122591b8518a2d3cd..47ae0223cb1147cce4fd4d46fd6c7ba559b0dd78 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -9,13 +9,7 @@
      project: 'reservation'
      project-name: 'reservation'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[reservation]'
@@ -34,13 +28,7 @@
      project: 'reservation'
      project-name: 'reservation'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[reservation]'
@@ -60,13 +48,7 @@
      project-name: 'reservation'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[reservation]'
@@ -83,5 +65,4 @@
      project-name: 'reservation'
      branch: 'master'
      mvn-settings: 'reservation-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml

index 90d2d5aa51c2cd2e39b9d2a686b0e36259de03d6..a970d3bafa477228684d00a2d460660ced6c6f51 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -10,13 +10,7 @@
      project: 'sdninterfaceapp'
      project-name: 'sdninterfaceapp'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'bgpcep-merge-{stream}'
      email-upstream: '[sdninterfaceapp] [bgpcep]'
@@ -36,13 +30,7 @@
      project: 'sdninterfaceapp'
      project-name: 'sdninterfaceapp'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'bgpcep-merge-{stream}'
      email-upstream: '[sdninterfaceapp] [bgpcep]'
@@ -63,13 +51,7 @@
      project-name: 'sdninterfaceapp'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'bgpcep-merge-{stream}'
      email-upstream: '[sdninterfaceapp] [bgpcep]'
@@ -86,5 +68,4 @@
      project-name: 'sdninterfaceapp'
      branch: 'master'
      mvn-settings: 'sdninterfaceapp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml

index 972f346a217eaf762da8cbfe1547e1ac909e8c18..d1f34cc64950f5377908e7a09aa6796c278c44de 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.yaml
@@ -10,19 +10,13 @@
      project: 'sfc'
      project-name: 'sfc'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      build-timeout: 120
      dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
      email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
      archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
  
      # Used by the release job
      staging-profile-id: a68eb361ca48a
@@ -38,18 +32,12 @@
      project: 'sfc'
      project-name: 'sfc'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
      email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
      archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
  
      # Used by the release job
      staging-profile-id: a68eb361ca48a
@@ -66,18 +54,12 @@
      project-name: 'sfc'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
      email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
      archive-artifacts: ''
-    build-node: centos7-builder-4c-16g
+    build-node: centos7-builder-8c-8g
  
      # Used by the release job
      staging-profile-id: a68eb361ca48a
@@ -90,5 +72,4 @@
      project-name: 'sfc'
      branch: 'master'
      mvn-settings: 'sfc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml

index 6958d317b28040012d3063ffbca832260d4c4941..b580353fa3573a8ae54daab23b106dcb24b87643 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -10,13 +10,7 @@
      project: 'snbi'
      project-name: 'snbi'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[snbi]'
@@ -36,13 +30,7 @@
      project: 'snbi'
      project-name: 'snbi'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[snbi]'
@@ -63,13 +51,7 @@
      project-name: 'snbi'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[snbi]'
@@ -86,5 +68,4 @@
      project-name: 'snbi'
      branch: 'master'
      mvn-settings: 'snbi-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml

index c73acb1be656456653b288aca1227a94e4ff1a8d..0797d5820f738f03ed8b0e1b448d8c2c6d7c41a8 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -10,13 +10,7 @@
      project: 'snmp'
      project-name: 'snmp'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[snmp] [odlparent]'
@@ -36,13 +30,7 @@
      project: 'snmp'
      project-name: 'snmp'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[snmp] [odlparent]'
@@ -63,13 +51,7 @@
      project-name: 'snmp'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[snmp] [odlparent]'
@@ -86,5 +68,4 @@
      project-name: 'snmp'
      branch: 'master'
      mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml

index b291290359abd6e26aac06e780626fe7a66d367d..6bf8e0fec2f2cd0c54d5d7c48a58242afb1a0aef 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -10,13 +10,7 @@
      project: 'snmp4sdn'
      project-name: 'snmp4sdn'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
@@ -36,13 +30,7 @@
      project: 'snmp4sdn'
      project-name: 'snmp4sdn'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
@@ -63,13 +51,7 @@
      project-name: 'snmp4sdn'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
@@ -86,5 +68,4 @@
      project-name: 'snmp4sdn'
      branch: 'master'
      mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml

index a74ba2d59564fac992e307bb4d457b70e6d38e45..bbc06bd2ed36f7a8dc152a72eccc1fca24b27bd0 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -10,13 +10,7 @@
      project: 'sxp'
      project-name: 'sxp'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
@@ -36,13 +30,7 @@
      project: 'sxp'
      project-name: 'sxp'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
@@ -63,13 +51,7 @@
      project-name: 'sxp'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
@@ -86,5 +68,4 @@
      project-name: 'sxp'
      branch: 'master'
      mvn-settings: 'sxp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml

index 88514e606c22d9a6384fb66046498621e3b29cd3..e90c54398aa1cb555419c1e894e4196d3b8dfbed 100644 (file)
--- a/jjb/systemmetrics/systemmetrics.yaml
+++ b/jjb/systemmetrics/systemmetrics.yaml
@@ -9,13 +9,7 @@
      project-name: 'systemmetrics'
      stream: oxygen
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'systemmetrics-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: '[systemmetrics] [odlparent] [yangtools] [controller]'
@@ -34,13 +28,7 @@
      project-name: 'systemmetrics'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'systemmetrics-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: '[systemmetrics] [odlparent] [yangtools] [controller]'
@@ -60,13 +48,7 @@
      stream: carbon
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'systemmetrics-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: '[systemmetrics] [odlparent] [yangtools] [controller]'
@@ -84,5 +66,4 @@
      project-name: 'systemmetrics'
      branch: 'master'
      mvn-settings: 'systemmetrics-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/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml

index 6c78c55e2cf5545a7790ae751e1377705ef9234f..95a78bf243d8259939101681ce1b7508630b0e22 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -10,13 +10,7 @@
      project: 'topoprocessing'
      project-name: 'topoprocessing'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
@@ -36,13 +30,7 @@
      project: 'topoprocessing'
      project-name: 'topoprocessing'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
@@ -63,13 +51,7 @@
      project-name: 'topoprocessing'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
@@ -85,9 +67,5 @@
      project: 'topoprocessing'
      project-name: 'topoprocessing'
      branch: 'master'
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml

index a905cf964ee932339d8480ccad55846251af2173..c1602ba26f538243bee4eaadc8c8dceb3970a84b 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -9,13 +9,7 @@
      project-name: 'transportpce'
      stream: oxygen
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'transportpce-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: '[transportpce] [odlparent] [yangtools] [controller]'
@@ -34,13 +28,7 @@
      project-name: 'transportpce'
      stream: nitrogen
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'transportpce-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: '[transportpce] [odlparent] [yangtools] [controller]'
@@ -60,13 +48,7 @@
      stream: carbon
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'transportpce-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: '[transportpce] [odlparent] [yangtools] [controller]'
@@ -84,5 +66,4 @@
      project-name: 'transportpce'
      branch: 'master'
      mvn-settings: 'transportpce-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/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml

index d1cae2d6a15af955fb5850b3d35b9ab4163e6e4c..8b26f5df0cf3d5af6bc35f9cd1b1f37eeaf1a563 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -10,13 +10,7 @@
      project: 'tsdr'
      project-name: 'tsdr'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[tsdr]'
@@ -36,13 +30,7 @@
      project: 'tsdr'
      project-name: 'tsdr'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[tsdr]'
@@ -63,13 +51,7 @@
      project-name: 'tsdr'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[tsdr]'
@@ -86,5 +68,4 @@
      project-name: 'tsdr'
      branch: 'master'
      mvn-settings: 'tsdr-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml

index 41de1a0dde1892ba3cab46fb1ee0f727d836c812..61b06172461e5ab32b21b9f1694ca8318afba875 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -10,13 +10,7 @@
      project: 'ttp'
      project-name: 'ttp'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[ttp] [odlparent]'
@@ -36,13 +30,7 @@
      project: 'ttp'
      project-name: 'ttp'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[ttp] [odlparent]'
@@ -63,13 +51,7 @@
      project-name: 'ttp'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[ttp] [odlparent]'
@@ -86,5 +68,4 @@
      project-name: 'ttp'
      branch: 'master'
      mvn-settings: 'ttp-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml

index 10f6028891e456a350418770ae510b82226914ca..10e12ff2e0a62c998c3f30149613167d6e4be4c5 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -10,13 +10,7 @@
      project: 'unimgr'
      project-name: 'unimgr'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'ovsdb-merge-{stream}'
      email-upstream: '[unimgr] [ovsdb]'
@@ -37,13 +31,7 @@
      project: 'unimgr'
      project-name: 'unimgr'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'ovsdb-merge-{stream}'
      email-upstream: '[unimgr] [ovsdb]'
@@ -65,13 +53,7 @@
      project-name: 'unimgr'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'ovsdb-merge-{stream}'
      email-upstream: '[unimgr] [ovsdb]'
@@ -89,5 +71,4 @@
      project-name: 'unimgr'
      branch: 'master'
      mvn-settings: 'unimgr-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml

index 86b4017fef51d6c38652123f26ac34f79140b756..16a9e10e24ca12ca8f89e86c5ea4766e3729579e 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -11,13 +11,7 @@
      project: 'usc'
      project-name: 'usc'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
      email-upstream: '[usc] [controller] [yangtools] [odlparent]'
@@ -38,13 +32,7 @@
      project: 'usc'
      project-name: 'usc'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
      email-upstream: '[usc] [controller] [yangtools] [odlparent]'
@@ -66,13 +54,7 @@
      project-name: 'usc'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
      email-upstream: '[usc] [controller] [yangtools] [odlparent]'
@@ -89,5 +71,4 @@
      project-name: 'usc'
      branch: 'master'
      mvn-settings: 'usc-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml

index 1efca00c4429260e513b98ab9d730806e337b9c7..4d0ee2843f4774a5c2c8fd09e6137b43bd30c0e0 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -10,13 +10,7 @@
      project: 'usecplugin'
      project-name: 'usecplugin'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
      email-upstream: '[usecplugin] [openflowplugin]'
@@ -36,13 +30,7 @@
      project: 'usecplugin'
      project-name: 'usecplugin'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
      email-upstream: '[usecplugin] [openflowplugin]'
@@ -63,13 +51,7 @@
      project-name: 'usecplugin'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'openflowplugin-merge-{stream}'
      email-upstream: '[usecplugin] [openflowplugin]'
@@ -86,5 +68,4 @@
      project: 'usecplugin'
      project-name: 'usecplugin'
      mvn-settings: 'usecplugin-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml

index ef610d940f4435f5fd2fa8c26c5f451cde69866e..197a5b653b996bf417e03f2056f8942c3e7a491a 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -29,17 +29,19 @@
            karaf-version: karaf3
  
      openstack:
-      - newton:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20171014-2147'
+      - pike:
+          openstack-branch: 'stable/pike'
+          odl-ml2-branch: 'stable/pike'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
+          enable-openstack-services: 'n-cpu,placement-api,placement-client,tempest'
+          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
+          odl-ml2-port-binding: 'legacy-port-binding'
  
      odl-enable-l3: 'no'
-
      public-bridge: 'br-ex'
-
-    enable-openstack-services: 'n-cpu,q-agt,q-svc,q-dhcp,q-meta,n-cauth,tempest'
-
      disable-openstack-services: 'n-net,q-l3'
-
      tenant-network-type: 'local'
+    odl_system_flavor: v1-performance-8
+    openstack_system_flavor: v1-performance-8
+    odl-ml2-driver-version: 'v2'
diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml

index 844a26552d370151614af41b90583e00f60f2f45..e0c973e458c3724d0f4eefaac76dbc716dd51520 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -11,13 +11,8 @@
      project: 'vtn'
      project-name: 'vtn'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
      email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
@@ -42,13 +37,8 @@
      project: 'vtn'
      project-name: 'vtn'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
      email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
@@ -74,13 +64,8 @@
      project-name: 'vtn'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}'
      email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]'
@@ -101,5 +86,5 @@
      project-name: 'vtn'
      branch: 'master'
      mvn-settings: 'vtn-settings'
-    mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
+    mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml

index fc38e865bbb090e646dace59d4cee31627ca7982..bc312bc658c4199cc8d88f5dfbfddcb8374dfecf 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -10,13 +10,7 @@
      project: 'yang-push'
      project-name: 'yang-push'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[yang-push]'
@@ -36,13 +30,7 @@
      project: 'yang-push'
      project-name: 'yang-push'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[yang-push]'
@@ -63,13 +51,7 @@
      project-name: 'yang-push'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[yang-push]'
@@ -86,5 +68,4 @@
      project-name: 'yang-push'
      branch: 'master'
      mvn-settings: 'yang-push-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml

index cd0617c9ca574738702cb2858f979ed0cb9e58cd..98e63de308e2f2687f7e6cda7f98009ca9d1db8c 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -9,13 +9,7 @@
      project: 'yangide'
      project-name: 'yangide'
      branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[yangide] [odlparent] [yangtools]'
@@ -34,13 +28,7 @@
      project: 'yangide'
      project-name: 'yangide'
      branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[yangide] [odlparent] [yangtools]'
@@ -60,13 +48,7 @@
      project-name: 'yangide'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[yangide] [odlparent] [yangtools]'
@@ -84,5 +66,4 @@
      project-name: 'yangide'
      branch: 'master'
      mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml

index 2a67a52d72978a538cf4252317d9ccf72ee2645d..5dbfb07b9afe078965e736a543d0d15d1c511cc5 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -10,15 +10,8 @@
      branch: master
      stream: master
  
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: ''
      email-upstream: '[yangtools]'
@@ -46,15 +39,8 @@
      project-name: 'yangtools'
      branch: 'v1.2.x'
      distribution_branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[yangtools] [odlparent]'
@@ -82,15 +68,8 @@
      project-name: 'yangtools'
      branch: 'stable/carbon'
      karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
      mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: mvn33
  
      dependencies: 'odlparent-merge-{stream}'
      email-upstream: '[yangtools] [odlparent]'
@@ -114,5 +93,4 @@
      project-name: 'yangtools'
      branch: 'master'
      mvn-settings: 'yangtools-settings'
-    mvn-goals: 'clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/packer/provision/builder.yaml b/packer/provision/builder.yaml

index 459c4a5342d95a3fd63215a4ffe2c3c25c5a82e6..7881b130653f62b3d8018d4b16431b60b68ba43b 100644 (file)
--- a/packer/provision/builder.yaml
+++ b/packer/provision/builder.yaml
@@ -19,21 +19,57 @@
      - mono-install
  
    tasks:
-    - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-      get_url:
-        url: 'https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-        dest: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
-        checksum: '{{cassandra_checksum}}'
-    - name: 'Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
-      get_url:
-        url: 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz'
-        dest: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
-        checksum: '{{elastic_search_checksum}}'
-    - name: 'Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz'
-      get_url:
-        url: 'https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz'
-        dest: '/tmp/hbase-{{hbase_version}}.tar.gz'
-        checksum: '{{hbase_checksum}}'
+    - name: Install Cassandra Server
+      block:
+        - name: 'Fetch Cassandra Server to /tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+          get_url:
+            url: 'https://archive.apache.org/dist/cassandra/{{cassandra_version}}/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            dest: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            checksum: '{{cassandra_checksum}}'
+        - name: Make /tmp/cassandra directory
+          file:
+            path: /tmp/cassandra
+            state: directory
+            mode: 0755
+        - name: Untar Cassandra server to /tmp/cassandra
+          unarchive:
+            src: '/tmp/apache-cassandra-{{cassandra_version}}-bin.tar.gz'
+            dest: /tmp/cassandra
+            remote_src: true
+    - name: Install Elastic Search
+      block:
+        - name: 'Fetch Elastic Search to /tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+          get_url:
+            url: 'https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-{{elastic_search_version}}.tar.gz'
+            dest: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+            checksum: '{{elastic_search_checksum}}'
+        - name: Make /tmp/elasticsearch directory
+          file:
+            path: /tmp/elasticsearch
+            state: directory
+            mode: 0755
+        - name: Untar Elastic Search to /tmp/elasticsearch
+          unarchive:
+            src: '/tmp/elasticsearch-{{elastic_search_version}}.tar.gz'
+            dest: /tmp/elasticsearch
+            remote_src: true
+    - name: Install HBase Server
+      block:
+        - name: 'Fetch HBase to /tmp/hbase-{{hbase_version}}.tar.gz'
+          get_url:
+            url: 'https://archive.apache.org/dist/hbase/hbase-{{hbase_version}}/hbase-{{hbase_version}}.tar.gz'
+            dest: '/tmp/hbase-{{hbase_version}}.tar.gz'
+            checksum: '{{hbase_checksum}}'
+        - name: Make /tmp/Hbase directory
+          file:
+            path: /tmp/Hbase
+            state: directory
+            mode: 0755
+        - name: Untar Hbase to /tmp/Hbase
+          unarchive:
+            src: '/tmp/hbase-{{hbase_version}}.tar.gz'
+            dest: /tmp/Hbase
+            remote_src: true
      - name: Install Quagga
        block:
          - name: Fetch Quagga git repo
author	Sam Hague <shague@redhat.com>
	Mon, 5 Feb 2018 15:46:56 +0000 (15:46 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Mon, 5 Feb 2018 15:46:56 +0000 (15:46 +0000)
docs/cloud-images.rst		patch \| blob \| history
jjb/aaa/aaa.yaml		patch \| blob \| history
jjb/alto/alto.yaml		patch \| blob \| history
jjb/atrium/atrium.yaml		patch \| blob \| history
jjb/bgpcep/bgpcep.yaml		patch \| blob \| history
jjb/bier/bier.yaml		patch \| blob \| history
jjb/capwap/capwap.yaml		patch \| blob \| history
jjb/cardinal/cardinal.yaml		patch \| blob \| history
jjb/centinel/centinel.yaml		patch \| blob \| history
jjb/coe/coe.yaml		patch \| blob \| history
jjb/controller/controller.yaml		patch \| blob \| history
jjb/coretutorials/coretutorials.yaml		patch \| blob \| history
jjb/daexim/daexim.yaml		patch \| blob \| history
jjb/didm/didm.yaml		patch \| blob \| history
jjb/dlux/dlux.yaml		patch \| blob \| history
jjb/dluxapps/dluxapps.yaml		patch \| blob \| history
jjb/eman/eman.yaml		patch \| blob \| history
jjb/faas/faas.yaml		patch \| blob \| history
jjb/federation/federation.yaml		patch \| blob \| history
jjb/genius/genius-csit-genius.yaml		patch \| blob \| history
jjb/genius/genius-patch-test.yaml		patch \| blob \| history
jjb/genius/genius.yaml		patch \| blob \| history
jjb/global-jjb		patch \| blob \| history
jjb/groupbasedpolicy/groupbasedpolicy.yaml		patch \| blob \| history
jjb/honeycomb/vbd/vbd.yaml		patch \| blob \| history
jjb/infrautils/infrautils.yaml		patch \| blob \| history
jjb/integration/common-functions.sh		patch \| blob \| history
jjb/integration/copy-common-functions.sh	[new file with mode: 0644]	patch \| blob
jjb/integration/csit-jobs-carbon.lst		patch \| blob \| history
jjb/integration/csit-jobs-nitrogen.lst		patch \| blob \| history
jjb/integration/csit-jobs-oxygen.lst		patch \| blob \| history
jjb/integration/distribution/distribution-jobs.yaml		patch \| blob \| history
jjb/integration/distribution/distribution-templates.yaml		patch \| blob \| history
jjb/integration/integration-configure-clustering.sh		patch \| blob \| history
jjb/integration/integration-deploy-controller-run-test.sh		patch \| blob \| history
jjb/integration/integration-deploy-openstack-run-test.sh		patch \| blob \| history
jjb/integration/integration-macros.yaml		patch \| blob \| history
jjb/integration/integration-templates.yaml		patch \| blob \| history
jjb/integration/integration-test-jobs.yaml		patch \| blob \| history
jjb/integration/integration4-templates.yaml		patch \| blob \| history
jjb/iotdm/iotdm.yaml		patch \| blob \| history
jjb/jsonrpc/jsonrpc.yaml		patch \| blob \| history
jjb/l2switch/l2switch.yaml		patch \| blob \| history
jjb/lacp/lacp.yaml		patch \| blob \| history
jjb/lispflowmapping/lispflowmapping.yaml		patch \| blob \| history
jjb/mdsal/mdsal.yaml		patch \| blob \| history
jjb/messaging4transport/messaging4transport.yaml		patch \| blob \| history
jjb/natapp/natapp.yaml		patch \| blob \| history
jjb/nemo/nemo.yaml		patch \| blob \| history
jjb/netconf/netconf.yaml		patch \| blob \| history
jjb/netide/netide.yaml		patch \| blob \| history
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml		patch \| blob \| history
jjb/netvirt/netvirt-csit-multi-openstack.yaml		patch \| blob \| history
jjb/netvirt/netvirt.yaml		patch \| blob \| history
jjb/neutron/neutron.yaml		patch \| blob \| history
jjb/next/next.yaml		patch \| blob \| history
jjb/nic/nic.yaml		patch \| blob \| history
jjb/ocpplugin/ocpplugin.yaml		patch \| blob \| history
jjb/odlparent/odlparent.yaml		patch \| blob \| history
jjb/of-config/of-config.yaml		patch \| blob \| history
jjb/ofextensions/circuitsw/circuitsw.yaml		patch \| blob \| history
jjb/openflowjava/openflowjava.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin.yaml		patch \| blob \| history
jjb/ovil/ovil.yaml		patch \| blob \| history
jjb/ovsdb/ovsdb.yaml		patch \| blob \| history
jjb/p4plugin/p4plugin.yaml		patch \| blob \| history
jjb/packetcable/packetcable.yaml		patch \| blob \| history
jjb/persistence/persistence.yaml		patch \| blob \| history
jjb/releng-defaults.yaml		patch \| blob \| history
jjb/releng-packer-jobs.yaml		patch \| blob \| history
jjb/releng-templates-java.yaml		patch \| blob \| history
jjb/reservation/reservation.yaml		patch \| blob \| history
jjb/sdninterfaceapp/sdninterfaceapp.yaml		patch \| blob \| history
jjb/sfc/sfc.yaml		patch \| blob \| history
jjb/snbi/snbi.yaml		patch \| blob \| history
jjb/snmp/snmp.yaml		patch \| blob \| history
jjb/snmp4sdn/snmp4sdn.yaml		patch \| blob \| history
jjb/sxp/sxp.yaml		patch \| blob \| history
jjb/systemmetrics/systemmetrics.yaml		patch \| blob \| history
jjb/topoprocessing/topoprocessing.yaml		patch \| blob \| history
jjb/transportpce/transportpce.yaml		patch \| blob \| history
jjb/tsdr/tsdr.yaml		patch \| blob \| history
jjb/ttp/ttp.yaml		patch \| blob \| history
jjb/unimgr/unimgr.yaml		patch \| blob \| history
jjb/usc/usc.yaml		patch \| blob \| history
jjb/usecplugin/usecplugin.yaml		patch \| blob \| history
jjb/vtn/vtn-manager-csit-1node-openstack.yaml		patch \| blob \| history
jjb/vtn/vtn.yaml		patch \| blob \| history
jjb/yang-push/yang-push.yaml		patch \| blob \| history
jjb/yangide/yangide.yaml		patch \| blob \| history
jjb/yangtools/yangtools.yaml		patch \| blob \| history
packer/provision/builder.yaml		patch \| blob \| history