Merge "Fix code-block being rendered as quotes"

author Vratko Polák <vrpolak@cisco.com>

Thu, 28 Jul 2016 08:53:09 +0000 (08:53 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Thu, 28 Jul 2016 08:53:09 +0000 (08:53 +0000)
author Vratko Polák <vrpolak@cisco.com>
Thu, 28 Jul 2016 08:53:09 +0000 (08:53 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Thu, 28 Jul 2016 08:53:09 +0000 (08:53 +0000)
diff --git a/docs/jenkins.rst b/docs/jenkins.rst

index 73f87f584fbf9f3d3f566cb70af5878e5e941424..c7a098e3a112b12cacb89b1282e707d9fae0983e 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -727,10 +727,11 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
        </tr>
        <tr>
          <td colspan="2">
-          This job template can be used by a project that is Python based. It
-          simply installs a python virtualenv and uses tox to run tests. When
-          using the template you need to provide a {toxdir} which is the path
-          relative to the root of the project repo containing the tox.ini file.
+          This job template can be used by a project that contains Python. It
+          simply installs a Python virtualenv and uses tox to run the tests
+          defined in the project's tox.ini file. If the tox.ini is anywhere
+          other than the project's repo root, the path to its directory
+          relative to the project's repo root should be passed as {toxdir}.
          </td>
        </tr>
  
diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml

index de5eedd809917a74b286767118d61df265c3b2d9..3bfbc8f7898e4a64dfcba8e36b715165bb88089f 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: didm
+    name: didm-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'didm-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: ''
+    email-upstream: '[didm]'
+    archive-artifacts: ''
+
+- project:
+    name: didm-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'didm-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: ''
+    email-upstream: '[didm]'
+    archive-artifacts: ''
+
+- project:
+    name: didm-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'didm'
      project-name: 'didm'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'didm-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: ''
      email-upstream: '[didm]'
      archive-artifacts: ''
+
+- project:
+    name: didm-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'didm'
+    project-name: 'didm'
+    branch: 'master'
+    mvn-settings: 'didm-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/discovery/discovery.yaml b/jjb/discovery/discovery.yaml

index 740974b4fd783359acd6b29691cfbc3efb6d1dc7..1c3fc5de23467a9921a17aa32c5833b89154c780 100644 (file)
--- a/jjb/discovery/discovery.yaml
+++ b/jjb/discovery/discovery.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: discovery
+    name: discovery-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,33 +8,69 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: False
+    project: 'discovery'
+    project-name: 'discovery'
+    branch: 'master'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'discovery-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: ''
+    email-upstream: '[discovery]'
+    archive-artifacts: ''
+
+- project:
+    name: discovery-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: False
-
      project: 'discovery'
      project-name: 'discovery'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'discovery-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: ''
      email-upstream: '[discovery]'
      archive-artifacts: ''
+
+- project:
+    name: discovery-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'discovery'
+    project-name: 'discovery'
+    branch: 'master'
+    mvn-settings: 'discovery-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/dlux/dlux.yaml b/jjb/dlux/dlux.yaml

index 7af8fae0d30d28015e791c4ec1e416352223b08b..2c62bbe8bbc436c0e79eff4c404ac3749eb6a139 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: dlux
+    name: dlux-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'dlux-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}'
+    email-upstream: '[dlux] [odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: dlux-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'dlux-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}'
+    email-upstream: '[dlux] [odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: dlux-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'dlux'
      project-name: 'dlux'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'dlux-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}'
      email-upstream: '[dlux] [odlparent]'
      archive-artifacts: ''
+
+- project:
+    name: dlux-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'dlux'
+    project-name: 'dlux'
+    branch: 'master'
+    mvn-settings: 'dlux-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/faas/faas.yaml b/jjb/faas/faas.yaml

index 25ca0336e248f093f5c0ac452a4d2467de4abbf6..d11cd0450f1dbb1d7c229b4ef230be57a6bb15bb 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: faas
+    name: faas-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,34 +8,70 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'faas-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: ''
+    email-upstream: '[faas]'
+    archive-artifacts: ''
+
+- project:
+    name: faas-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
-
      project: 'faas'
      project-name: 'faas'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'faas-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: ''
      email-upstream: '[faas]'
      archive-artifacts: ''
+
+- project:
+    name: faas-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    mvn-settings: 'faas-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.yaml b/jjb/genius/genius.yaml

index 4f63a973d37c1d40a7f9ee6ae9d5bb2cadf2bd86..134be24f93a68bb68f6088d0d2cb16090691bf9d 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: genius
+    name: genius-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,26 +8,38 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
-
      project: 'genius'
      project-name: 'genius'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'genius-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: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
      email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
      archive-artifacts: ''
+
+- project:
+    name: genius-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'genius'
+    project-name: 'genius'
+    branch: 'master'
+    mvn-settings: 'genius-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/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh

index 85e2eee41b1ec48f8f86a8509f9c9af965813d13..afd6bed748e0b949fa32173086e5532bc5eb0d67 100644 (file)
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -68,7 +68,7 @@ echo "Configuring the startup features..."
  FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
  CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
  sed -ie "s/featuresBoot=.*/featuresBoot=config,standard,region,package,kar,ssh,management,${ACTUALFEATURES}/g" \${FEATURESCONF}
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" \${FEATURESCONF}
+sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" \${FEATURESCONF}
  cat \${FEATURESCONF}
  
  echo "Configuring the log..."
diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml

index 662e882b01f49c4739066a6ebd985da18aa6865b..b12c0d6b86040c5f76b8330184576f0ab6b8e59d 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: iotdm
+    name: iotdm-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,42 +8,102 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'iotdm-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: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+    archive-artifacts: ''
+
+- project:
+    name: iotdm-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'iotdm-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: 'aaa-merge-{stream}'
+    email-upstream: '[iotdm] [aaa]'
+    archive-artifacts: ''
+
+- project:
+    name: iotdm-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'iotdm'
      project-name: 'iotdm'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'iotdm-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: 'aaa-merge-{stream}'
      email-upstream: '[iotdm] [aaa]'
      archive-artifacts: ''
+
+- project:
+    name: iotdm-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'iotdm'
+    project-name: 'iotdm'
+    branch: 'master'
+    mvn-settings: 'iotdm-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 a3dbc37e7a0b323f1d06bd1b534dfaf515b97a95..97f2df947d03867ada7528bb9219a21009fd5112 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: l2switch
+    name: l2switch-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'l2switch-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    archive-artifacts: ''
+
+- project:
+    name: l2switch-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'l2switch-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
+    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    archive-artifacts: ''
+
+- project:
+    name: l2switch-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'l2switch'
      project-name: 'l2switch'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'l2switch-settings'
      mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream}'
      email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
      archive-artifacts: ''
+
+- project:
+    name: l2switch-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'l2switch'
+    project-name: 'l2switch'
+    branch: 'master'
+    mvn-settings: 'l2switch-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml

index c11899821bff07dff67f06d568f6075d15b29eb2..0453c377ae5f753f7122d1a7ef5ee78ce14283f0 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: lispflowmapping
+    name: lispflowmapping-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,39 +8,90 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    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-java-builder-4c-8g
+
+- project:
+    name: lispflowmapping-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    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-java-builder-4c-8g
+
+- project:
+    name: lispflowmapping-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'lispflowmapping'
      project-name: 'lispflowmapping'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'lispflowmapping-settings'
      mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
@@ -48,3 +99,14 @@
      email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
      archive-artifacts: ''
      build-node: centos7-java-builder-4c-8g
+
+- project:
+    name: lispflowmapping-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'lispflowmapping'
+    project-name: 'lispflowmapping'
+    branch: 'master'
+    mvn-settings: 'lispflowmapping-settings'
+    mvn-goals: 'clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml

index 0b3ab901e3e94a683d104e01f1b0e7cc0e87b8a5..8530d9a7c41a045e590a298508abb0e4f6ab79e9 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: natapp
+    name: natapp-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,26 +8,38 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
-
      project: 'natapp'
      project-name: 'natapp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'natapp-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: 'openflowplugin-merge-{stream}'
      email-upstream: '[natapp] [openflowplugin]'
      archive-artifacts: ''
+
+- project:
+    name: natapp-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'natapp'
+    project-name: 'natapp'
+    branch: 'master'
+    mvn-settings: 'natapp-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/netvirt/netvirt-csit-clustering.yaml b/jjb/netvirt/netvirt-csit-clustering.yaml

index 5f21cbaf571ad736a3c626f1eed1b2e2f6ceadb4..d29217e854a94af78a704d943dde628d07ec6bb7 100644 (file)
--- a/jjb/netvirt/netvirt-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-csit-clustering.yaml
@@ -27,7 +27,7 @@
              scope: 'only'
  
      # Features to install
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
  
      # Robot custom options
      robot-options: ''
diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml

index 579e02bdf0568e3fee1cbdb9628c6185d3e58e70..8b4b059278db7d060a6d3f239d3dcafe3725fb9f 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: netvirt
+    name: netvirt-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -9,36 +9,86 @@
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'netvirt'
+    project-name: 'netvirt'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'netvirt-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    dependencies: 'neutron-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+    archive-artifacts: ''
+
+- project:
+    name: netvirt-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'netvirt'
+    project-name: 'netvirt'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'netvirt-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    dependencies: 'neutron-merge-{stream},openflowjava-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream},sfc-merge-{stream}'
+    email-upstream: '[netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
+    archive-artifacts: ''
+
+- project:
+    name: netvirt-routermanager
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - routermanager:
-            branch: 'topic/routermanager'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
-
      project: 'netvirt'
      project-name: 'netvirt'
+    branch: 'topic/routermanager'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'netvirt-settings'
      mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
      mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml

index ccb7e138ee9c7d59cbb127959fff30815b402a2d..71d2bd05cf2a3c75d7c84fb63cc2f54c316b168a 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: neutron
+    name: neutron-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'neutron'
+    project-name: 'neutron'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'neutron-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},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+    archive-artifacts: ''
+
+- project:
+    name: neutron-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'neutron'
+    project-name: 'neutron'
+    branch: 'stable/beryllium'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'neutron-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},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+    archive-artifacts: ''
+
+- project:
+    name: neutron-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'neutron'
      project-name: 'neutron'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'neutron-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},aaa-merge-{stream}'
      email-upstream: '[neutron] [odlparent] [aaa]'
      archive-artifacts: ''
+
+- project:
+    name: neutron-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'neutron'
+    project-name: 'neutron'
+    branch: 'master'
+    mvn-settings: 'neutron-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/next/next.yaml b/jjb/next/next.yaml

index 892f447539aa8a0685a00e635f294e65c913ae77..6adf332badb787646391a4fc58003d20e66334a1 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: next
+    name: next-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,34 +8,70 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'next-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: ''
+    email-upstream: '[next]'
+    archive-artifacts: ''
+
+- project:
+    name: next-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
-
      project: 'next'
      project-name: 'next'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'next-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: ''
      email-upstream: '[next]'
      archive-artifacts: ''
+
+- project:
+    name: next-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'next'
+    project-name: 'next'
+    branch: 'master'
+    mvn-settings: 'tsdr-settings'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml

index d4cacd8c3219b9835d887a15fd2d81d171d7b8c6..9269f9a9cb8601c82121d6ddf7baef437f9ddb23 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: nic
+    name: nic-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'nic-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: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
+    archive-artifacts: ''
+
+- project:
+    name: nic-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'nic-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: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
+    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
+    archive-artifacts: ''
+
+- project:
+    name: nic-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'nic'
      project-name: 'nic'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'nic-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: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
      email-upstream: '[nic] [vtn] [groupbasedpolicy]'
      archive-artifacts: ''
+
+- project:
+    name: nic-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'nic'
+    project-name: 'nic'
+    branch: 'master'
+    mvn-settings: 'nic-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/of-config/of-config.yaml b/jjb/of-config/of-config.yaml

index d3238fa893c69c3e570cf4beb7c58f710b8b1e93..32f40b196b2aaba1ff2831f61a7586b1bf497f23 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: of-config
+    name: of-config-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,34 +8,70 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'of-config-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: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+    archive-artifacts: ''
+
+- project:
+    name: of-config-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
-
      project: 'of-config'
      project-name: 'of-config'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'of-config-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: netconf-merge-{stream}'
      email-upstream: '[of-config] [netconf]'
      archive-artifacts: ''
+
+- project:
+    name: of-config-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    mvn-settings: 'of-config-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/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg

deleted file mode 100644 (file)

index 50d8c15..0000000
--- a/jjb/ofextensions/circuitsw/circuitsw.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-STREAMS:
-- boron:
-    branch: master
-    jdks: openjdk8
-    autorelease: true
-- beryllium:
-    branch: stable/beryllium
-    jdks: openjdk7,openjdk8
-DEPENDENCIES: yangtools,controller,openflowplugin
diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml

index c05ef165aa0af001a2e54e2ed97124aec82521a4..65373a7db5562da46582d1406082b8baaac6dd9f 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: circuitsw
+    name: circuitsw-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,34 +8,70 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'ofextensions-circuitsw-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: ''
+    email-upstream: '[circuitsw]'
+    archive-artifacts: ''
+
+- project:
+    name: circuitsw-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: False
-
      project: 'ofextensions/circuitsw'
      project-name: 'circuitsw'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'ofextensions-circuitsw-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: ''
      email-upstream: '[circuitsw]'
      archive-artifacts: ''
+
+- project:
+    name: circuitsw-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'master'
+    mvn-settings: 'ofextensions-circuitsw-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/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml

index efb70ce35fb4a25636e2fceafc9fc17a53d05d7d..a2f24dbeb43c25908384f113a31650740560df76 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: openflowplugin
+    name: openflowplugin-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,42 +8,102 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+    archive-artifacts: 'model/*/target/site/**'
+
+- project:
+    name: openflowplugin-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
+    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
+    archive-artifacts: 'model/*/target/site/**'
+
+- project:
+    name: openflowplugin-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'openflowplugin'
      project-name: 'openflowplugin'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'openflowplugin-settings'
      mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},openflowjava-merge-{stream}'
      email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
      archive-artifacts: 'model/*/target/site/**'
+
+- project:
+    name: openflowplugin-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'openflowplugin'
+    project-name: 'openflowplugin'
+    branch: 'master'
+    mvn-settings: 'openflowplugin-settings'
+    mvn-goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install javadoc:aggregate'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml

index 121505fc95d89f3ef722f82b0024cf43c31409ed..0830dd6746a50e56c2d224a2abda999a53fb21e5 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: packetcable
+    name: packetcable-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'packetcable-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: ''
+    email-upstream: '[packetcable]'
+    archive-artifacts: ''
+
+- project:
+    name: packetcable-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'packetcable-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: ''
+    email-upstream: '[packetcable]'
+    archive-artifacts: ''
+
+- project:
+    name: packetcable-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'packetcable'
      project-name: 'packetcable'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'packetcable-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: ''
      email-upstream: '[packetcable]'
      archive-artifacts: ''
+
+- project:
+    name: packetcable-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'packetcable'
+    project-name: 'packetcable'
+    branch: 'master'
+    mvn-settings: 'packetcable-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/persistence/persistence.yaml b/jjb/persistence/persistence.yaml

index fe919d7f53c80e4fcd8a93173e9ec15a2964d9d2..9d60bc029656127ead8e689fdd55a10b14a0e985 100644 (file)
--- a/jjb/persistence/persistence.yaml
+++ b/jjb/persistence/persistence.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: persistence
+    name: persistence-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,43 +8,103 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: False
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'master'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'persistence-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: ''
+    email-upstream: '[persistence]'
+    archive-artifacts: ''
+
+- project:
+    name: persistence-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: False
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'persistence-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: ''
+    email-upstream: '[persistence]'
+    archive-artifacts: ''
+
+- project:
+    name: persistence-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'persistence'
      project-name: 'persistence'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'persistence-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: ''
      email-upstream: '[persistence]'
      archive-artifacts: ''
+
+- project:
+    name: persistence-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'persistence'
+    project-name: 'persistence'
+    branch: 'master'
+    mvn-settings: 'persistence-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/releng-templates.yaml b/jjb/releng-templates.yaml

index ed4f704452e77d78a47dfab2bb510a19fdbcaa64..dda4674115dde2b91245c0373ddd397b30da9f46 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -123,7 +123,7 @@
      #     stream:    release stream (eg. stable-lithium or beryllium)
      #     branch:    git branch (eg. stable/lithium or master)
      #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace.
+    #                the workspace. Empty works if tox.ini is at project root.
  
      project-type: freestyle
      node: '{build-node}'
diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml

index 9a4e44defd95f5d2ba4eafc68aa89f7ff5b745af..b642421767b2b2aa46eacab0ea883a5dd74e8997 100644 (file)
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: reservation
+    name: reservation-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'reservation-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: ''
+    email-upstream: '[reservation]'
+    archive-artifacts: ''
+
+- project:
+    name: reservation-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'reservation-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: ''
+    email-upstream: '[reservation]'
+    archive-artifacts: ''
+
+- project:
+    name: reservation-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'reservation'
      project-name: 'reservation'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'reservation-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: ''
      email-upstream: '[reservation]'
      archive-artifacts: ''
+
+- project:
+    name: reservation-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'reservation'
+    project-name: 'reservation'
+    branch: 'master'
+    mvn-settings: 'reservation-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/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml

index 1417bd3e702a5de1f32037156dfd3e50b90a0f23..673d3367f4c4f0158afcf7537b22bc10054fc863 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: sdninterfaceapp
+    name: sdninterfaceapp-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,42 +8,102 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'sdninterfaceapp-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: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
+    archive-artifacts: ''
+
+- project:
+    name: sdninterfaceapp-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'sdninterfaceapp-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: 'bgpcep-merge-{stream}'
+    email-upstream: '[sdninterfaceapp] [bgpcep]'
+    archive-artifacts: ''
+
+- project:
+    name: sdninterfaceapp-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
              branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'sdninterfaceapp'
      project-name: 'sdninterfaceapp'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'sdninterfaceapp-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: 'bgpcep-merge-{stream}'
      email-upstream: '[sdninterfaceapp] [bgpcep]'
      archive-artifacts: ''
+
+- project:
+    name: sdninterfaceapp-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'sdninterfaceapp'
+    project-name: 'sdninterfaceapp'
+    branch: 'master'
+    mvn-settings: 'sdninterfaceapp-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/snbi/snbi.yaml b/jjb/snbi/snbi.yaml

index 0546f0ef92e234ddd3be5724499724c7515e0efb..3f65cbf1e6f8626426fc11c717d1d694fcb41805 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: snbi
+    name: snbi-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,102 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'snbi-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: ''
+    email-upstream: '[snbi]'
+    archive-artifacts: ''
+
+
+- project:
+    name: snbi-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'snbi-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: ''
+    email-upstream: '[snbi]'
+    archive-artifacts: ''
+
+- project:
+    name: snbi-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'snbi'
      project-name: 'snbi'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'snbi-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: ''
      email-upstream: '[snbi]'
      archive-artifacts: ''
+
+- project:
+    name: snbi-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'snbi'
+    project-name: 'snbi'
+    branch: 'master'
+    mvn-settings: 'snbi-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/snmp/snmp.yaml b/jjb/snmp/snmp.yaml

index 68ad25340041a760f6ec077f1265b108138d2168..705eeda146bf5ed0452a898c4706c5a745b4eda6 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: snmp
+    name: snmp-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,42 +8,102 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'snmp-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}'
+    email-upstream: '[snmp] [odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: snmp-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'snmp-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}'
+    email-upstream: '[snmp] [odlparent]'
+    archive-artifacts: ''
+
+- project:
+    name: snmp-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'snmp'
      project-name: 'snmp'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'snmp-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}'
      email-upstream: '[snmp] [odlparent]'
      archive-artifacts: ''
+
+- project:
+    name: snmp-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'snmp'
+    project-name: 'snmp'
+    branch: 'master'
+    mvn-settings: 'snmp-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/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml

index 09329d917512d8312b22d54d8d8b8fc9916e1a19..8939b58da6da6f45223d949f07eaf4c4f89062a0 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: snmp4sdn
+    name: snmp4sdn-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,101 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'snmp4sdn-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},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
+- project:
+    name: snmp4sdn-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'snmp4sdn-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},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
+- project:
+    name: snmp4sdn-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'snmp4sdn'
      project-name: 'snmp4sdn'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'snmp4sdn-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},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
      archive-artifacts: ''
+
+- project:
+    name: snmp4sdn-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'master'
+    mvn-settings: 'snmp4sdn-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 c701e3a47440b5b9e255f3347fe664efe9dce987..e0c75df146a36ebed5088c8000bc56ba0dec5c99 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: topoprocessing
+    name: topoprocessing-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,42 +8,109 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'topoprocessing-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},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
+
+- project:
+    name: topoprocessing-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'topoprocessing-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},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
+    archive-artifacts: ''
+
+
+- project:
+    name: topoprocessing-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'topoprocessing'
      project-name: 'topoprocessing'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'topoprocessing-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},controller-merge-{stream},yangtools-merge-{stream}'
      email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
      archive-artifacts: ''
+
+- project:
+    name: topoprocessing-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'topoprocessing'
+    project-name: 'topoprocessing'
+    branch: 'master'
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'topoprocessing-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 bbbb7dac6e7005de4f2dd5ecba8dc7f4099cbd63..9bb696b61509a75802dcb7856a3e5fc748735568 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: tsdr
+    name: tsdr-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,102 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'stable/beryllium'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'tsdr-settings'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+    archive-artifacts: ''
+
+- project:
+    name: tsdr-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'tsdr-settings'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[tsdr]'
+    archive-artifacts: ''
+
+- project:
+    name: tsdr-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
-
      project: 'tsdr'
      project-name: 'tsdr'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'tsdr-settings'
      mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
      dependencies: ''
      email-upstream: '[tsdr]'
      archive-artifacts: ''
+
+- project:
+    name: tsdr-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'tsdr'
+    project-name: 'tsdr'
+    branch: 'master'
+    mvn-settings: 'tsdr-settings'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml

index b7c58136cbbcd01c8bf4f886b7847f2b41af0725..033866bf25ad58a1d9d8af5d6a411d1c268003b8 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: usecplugin
+    name: usecplugin-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,34 +8,72 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'usecplugin-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: 'openflowplugin-merge-{stream}'
+    email-upstream: '[usecplugin] [openflowplugin]'
+    archive-artifacts: ''
+
+- project:
+    name: usecplugin-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
  
      project: 'usecplugin'
      project-name: 'usecplugin'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'usecplugin-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: 'openflowplugin-merge-{stream}'
      email-upstream: '[usecplugin] [openflowplugin]'
      archive-artifacts: ''
+
+
+- project:
+    name: usecplugin-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'usecplugin'
+    project-name: 'usecplugin'
+    mvn-settings: 'usecplugin-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/vpnservice/vpnservice.yaml b/jjb/vpnservice/vpnservice.yaml

index fdb3b257fec8455125cb9420bdb9bcd408592f59..dce12c7e33ddc1952837f51b80a087c40c771a23 100644 (file)
--- a/jjb/vpnservice/vpnservice.yaml
+++ b/jjb/vpnservice/vpnservice.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: vpnservice
+    name: vpnservice-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,41 +8,105 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'vpnservice'
+    project-name: 'vpnservice'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'vpnservice-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: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
+    archive-artifacts: ''
+
+- project:
+    name: vpnservice-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
          - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'vpnservice'
+    project-name: 'vpnservice'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'vpnservice-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: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
+    email-upstream: '[vpnservice] [openflowplugin] [neutron]'
+    archive-artifacts: ''
+
+- project:
+    name: vpnservice-lithium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+    stream:
          - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
              disable_autorelease: True
              disable_distribution_check: True
  
      project: 'vpnservice'
      project-name: 'vpnservice'
+    branch: 'stable/lithium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'vpnservice-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: 'openflowplugin-merge-{stream},neutron-merge-{stream}'
      email-upstream: '[vpnservice] [openflowplugin] [neutron]'
      archive-artifacts: ''
+
+- project:
+    name: vpnservice-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'vpnservice'
+    project-name: 'vpnservice'
+    mvn-settings: 'vpnservice-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/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml

index 710b95d6f811acc064153eee5931bdb86d74a7b1..86cea4e0cbbec1cafbf6be5da0da2d7bce75b194 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -1,6 +1,6 @@
  # ODL Releng build templates
  - project:
-    name: yang-push
+    name: yang-push-boron
      jobs:
          - '{project-name}-clm-{stream}'
          - '{project-name}-distribution-{stream}'
@@ -8,34 +8,73 @@
          - '{project-name}-integration-{stream}'
          - '{project-name}-merge-{stream}'
          - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
          - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
  
      # stream:    release stream (eg. stable-lithium or beryllium)
      # branch:    git branch (eg. stable/lithium or master)
      stream:
          - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
              disable_autorelease: False
              disable_distribution_check: False
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
+    mvn-settings: 'yang-push-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: ''
+    email-upstream: '[yang-push]'
+    archive-artifacts: ''
  
+- project:
+    name: yang-push-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    # stream:    release stream (eg. stable-lithium or beryllium)
+    # branch:    git branch (eg. stable/lithium or master)
+    stream:
+      - beryllium:
+          disable_autorelease: False
+          disable_distribution_check: False
      project: 'yang-push'
      project-name: 'yang-push'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+      - openjdk7
+      - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
      mvn-settings: 'yang-push-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: ''
      email-upstream: '[yang-push]'
      archive-artifacts: ''
+
+- project:
+    name: yang-push-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'yang-push'
+    project-name: 'yang-push'
+    branch: 'master'
+    mvn-settings: 'yang-push-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
author	Vratko Polák <vrpolak@cisco.com>
	Thu, 28 Jul 2016 08:53:09 +0000 (08:53 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Thu, 28 Jul 2016 08:53:09 +0000 (08:53 +0000)
docs/jenkins.rst		patch \| blob \| history
jjb/didm/didm.yaml		patch \| blob \| history
jjb/discovery/discovery.yaml		patch \| blob \| history
jjb/dlux/dlux.yaml		patch \| blob \| history
jjb/faas/faas.yaml		patch \| blob \| history
jjb/genius/genius.yaml		patch \| blob \| history
jjb/integration/include-raw-integration-configure-clustering.sh		patch \| blob \| history
jjb/iotdm/iotdm.yaml		patch \| blob \| history
jjb/l2switch/l2switch.yaml		patch \| blob \| history
jjb/lispflowmapping/lispflowmapping.yaml		patch \| blob \| history
jjb/natapp/natapp.yaml		patch \| blob \| history
jjb/netvirt/netvirt-csit-clustering.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/of-config/of-config.yaml		patch \| blob \| history
jjb/ofextensions/circuitsw/circuitsw.cfg	[deleted file]	patch \| blob \| history
jjb/ofextensions/circuitsw/circuitsw.yaml		patch \| blob \| history
jjb/openflowplugin/openflowplugin.yaml		patch \| blob \| history
jjb/packetcable/packetcable.yaml		patch \| blob \| history
jjb/persistence/persistence.yaml		patch \| blob \| history
jjb/releng-templates.yaml		patch \| blob \| history
jjb/reservation/reservation.yaml		patch \| blob \| history
jjb/sdninterfaceapp/sdninterfaceapp.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/topoprocessing/topoprocessing.yaml		patch \| blob \| history
jjb/tsdr/tsdr.yaml		patch \| blob \| history
jjb/usecplugin/usecplugin.yaml		patch \| blob \| history
jjb/vpnservice/vpnservice.yaml		patch \| blob \| history
jjb/yang-push/yang-push.yaml		patch \| blob \| history