Merge "Java 8 for CSIT jobs."

diff --combined jjb/integration/integration-distribution-jobs.yaml
index 97fed31c6f248302afcde064d70d9735ff937b8e,c4d67f30b8e0a79625a66f3d36151b47e089785b..fd2deac2ee4f9a411a9af3c531e3028f375c54f3
--- 1/jjb/integration/integration-distribution-jobs.yaml
--- 2/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@@ -71,7 -71,7 +71,7 @@@
      maven:
          maven-name: '{mvn33}'
          root-pom: 'pom.xml'
 -        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
 +        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r source:jar javadoc:jar'
          maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
          settings: '{integration-settings}'
          global-settings: '{odl-global-settings}'
@@@ -129,7 -129,7 +129,7 @@@
      maven:
          maven-name: '{mvn33}'
          root-pom: 'pom.xml'
 -        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
 +        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  source:jar javadoc:jar'
          maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
          settings: '{integration-settings}'
          global-settings: '{odl-global-settings}'
@@@ -150,7 -150,7 +150,7 @@@
      name: 'integration-distribution-deploy-{stream}'
  
      project-type: freestyle
 -    node: dynamic_controller
 +    node: dynamic_verify
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -165,6 -165,8 +165,8 @@@
              branch: '{branch}'
          - integration-bundleurl:
              bundleurl: 'last'
+         - integration-jdk-version:
+             jdkversion: 'openjdk7'
  
      wrappers:
          - build-timeout
@@@ -197,7 -199,7 +199,7 @@@
      name: 'integration-distribution-offline-{stream}'
  
      project-type: freestyle
 -    node: dynamic_controller
 +    node: dynamic_verify
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -212,6 -214,8 +214,8 @@@
              branch: '{branch}'
          - integration-bundleurl:
              bundleurl: 'last'
+         - integration-jdk-version:
+             jdkversion: 'openjdk7'
  
      wrappers:
          - build-timeout
@@@ -303,7 -307,7 +307,7 @@@
          - maven-target:
              maven-version: '{mvn33}'
              pom: '$GERRIT_PROJECT/pom.xml'
 -            goals: 'clean install -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
 +            goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
              java-opts:
                  - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
              settings: '{integration-settings}'
@@@ -312,7 -316,7 +316,7 @@@
      maven:
          maven-name: '{mvn33}'
          root-pom: 'distribution/pom.xml'
 -        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
 +        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
          maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
          settings: '{integration-settings}'
          global-settings: '{odl-global-settings}'
@@@ -329,3 -333,4 +333,3 @@@
      publishers:
          - email-notification:
              email-prefix: '[$GERRIT_PROJECT]'
 -

diff --combined jjb/integration/integration-macros.yaml
index cef6c7b383b1a5a12d038ffd26a9a08f7d0c4db0,6b2bd85ecbb3b154d65d812bac373871abbe1209..e76fda682c2cdf05aef9172597d46e422cc2abb3
--- 1/jjb/integration/integration-macros.yaml
--- 2/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@@ -14,6 -14,14 +14,14 @@@
              default: '{bundleurl}'
              description: 'URL to karaf distribution zip'
  
+ - parameter:
+     name: integration-jdk-version
+     parameters:
+         - string:
+             name: JDKVERSION
+             default: '{jdkversion}'
+             description: 'Parameter to indicate JAVA Version'
+ 
  - parameter:
      name: integration-controller-scope
      parameters:
@@@ -326,17 -334,6 +334,17 @@@
              !include-raw:
                  - include-raw-integration-cleanup-workspace.sh
  
 +# Macro: integration-rebase-patch
 +# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH.
 +# Used by: integration-patch-distribution-* job template
 +
 +- builder:
 +    name: integration-rebase-gerrit-patch
 +    builders:
 +        - shell:
 +            !include-raw:
 +                - include-raw-integration-rebase-gerrit-patch.sh
 +
  ##############
  # Publishers #
  ##############

diff --combined jjb/integration/integration-test-jobs.yaml
index 2930af5f50c6c2620fde952200a5528a1ed795fa,a4723a0711da46d17854841fc0a7885aaf19d7a6..82b3aa09d1d20272bf751789f717eb39ffc49cb8
--- 1/jjb/integration/integration-test-jobs.yaml
--- 2/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@@ -68,7 -68,9 +68,7 @@@
                  capwap-csit-1node-ac-only-{stream},
                  capwap-csit-1node-ac-all-{stream},
                  controller-csit-3node-clustering-only-{stream},
 -                controller-csit-3node-clustering-all-{stream},
                  integration-csit-3node-basic-only-{stream},
 -                integration-csit-3node-basic-all-{stream},
                  integration-distribution-offline-{stream},
                  l2switch-csit-1node-switch-only-{stream},
                  l2switch-csit-1node-switch-all-{stream},
@@@ -213,6 -215,8 +213,8 @@@
              test-plan: 'test-libraries.txt'
          - integration-patch-refspec:
              branch: '$GERRIT_REFSPEC'
+         - integration-jdk-version:
+             jdkversion: 'openjdk7'
  
      scm:
          - integration-gerrit-scm:
@@@ -280,6 -284,8 +282,8 @@@
      parameters:
          - integration-bundleurl:
              bundleurl: 'last'
+         - integration-jdk-version:
+             jdkversion: 'openjdk7'
  
      triggers:
          - timed: 'H H * * 6'
@@@ -320,8 -326,6 +324,8 @@@
              refspec: '$GERRIT_REFSPEC'
          - project-parameter:
              project: '$GERRIT_PROJECT'
 +        - integration-branch:
 +            branch: '{branch}'
          - integration-distribution-git-url
  
      scm:
@@@ -359,7 -363,6 +363,7 @@@
                  notbuilt: true
  
      prebuilders:
 +        - integration-rebase-gerrit-patch
          - integration-get-bundle-url
          - inject:
              properties-file: 'bundle.txt'
@@@ -367,7 -370,7 +371,7 @@@
          - maven-target:
              maven-version: '{mvn33}'
              pom: '$GERRIT_PROJECT/pom.xml'
 -            goals: 'clean install -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
 +            goals: 'clean install -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
              java-opts:
                  - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
              settings: '{integration-settings}'
@@@ -376,7 -379,7 +380,7 @@@
      maven:
          maven-name: '{mvn33}'
          root-pom: 'distribution/pom.xml'
 -        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
 +        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
          maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
          settings: '{integration-settings}'
          global-settings: '{odl-global-settings}'
@@@ -439,7 -442,7 +443,7 @@@
          maven-name: '{mvn33}'
          root-pom: 'patch_tester/pom.xml'
          # TODO: Make Maven option configurable. Currently tests are not skipped, everything elase is.
 -        goals: 'clean install -f patch_tester/pom.xml -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
 +        goals: 'clean install -f patch_tester/pom.xml -Djenkins -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
          maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
          settings: '{yangtools-settings}'
          global-settings: '{odl-global-settings}'