Merge "Add -Djenkins parameter to all CI jobs"

diff --combined jjb/autorelease/autorelease-templates.yaml
index 374550fd7c9a18bf07bdc45d66bb2dc799ee5882,72958958e10ecbd9e37e43634ca38cdc5613089c..e5c30d28aa04239c5efcba6539fc586746c9d7e7
--- 1/jjb/autorelease/autorelease-templates.yaml
--- 2/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@@ -55,7 -55,7 +55,7 @@@
      maven:
          maven-name: '{mvn33}'
          root-pom: 'pom.xml'
-         goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+         goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
          maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
          settings: '{autorelease-settings}'
          global-settings: '{odl-global-settings}'
@@@ -121,16 -121,13 +121,16 @@@
      prebuilders:
          - wipe-org-opendaylight-repo
          - jacoco-nojava-workaround
 +        - autorelease-cfp:
 +            autorelease-settings: '{autorelease-settings}'
 +            odl-global-settings: '{odl-global-settings}'
          - autorelease-generate-taglist
          - autorelease-generate-release-patches
  
      maven:
          maven-name: '{mvn33}'
          root-pom: 'pom.xml'
-         goals: 'clean install -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+         goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
          maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
          settings: '{autorelease-settings}'
          global-settings: '{odl-global-settings}'
@@@ -138,6 -135,9 +138,6 @@@
          post-step-run-condition: UNSTABLE
  
      postbuilders:
 -        - autorelease-cfp:
 -            autorelease-settings: '{autorelease-settings}'
 -            odl-global-settings: '{odl-global-settings}'
          - autorelease-maven-deploy
          - shell: "./scripts/list-project-dependencies.sh"
          - autorelease-get-integration-test-variables

diff --combined jjb/integration/integration-distribution-jobs.yaml
index 1dab5bbe0ddf0af90885e8ae2f3a241318b84c51,29f70c716f4558db408502e042f2480714c05d2c..97fed31c6f248302afcde064d70d9735ff937b8e
--- 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}'
@@@ -197,7 -197,7 +197,7 @@@
      name: 'integration-distribution-offline-{stream}'
  
      project-type: freestyle
 -    node: dynamic_controller
 +    node: dynamic_verify
  
      logrotate:
          daysToKeep: '{build-days-to-keep}'
@@@ -303,7 -303,7 +303,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 -312,7 +312,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 -329,4 +329,3 @@@
      publishers:
          - email-notification:
              email-prefix: '[$GERRIT_PROJECT]'
 -