X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=80783eaa287c1143d882bce5f7d8d5f1d263c2ef;hb=90a7b08bb7ef2cbbf24b5ba84c368d6b6576276b;hp=93b3ee0d2bacbe0fbfeeae6bca2e234b2b9b595e;hpb=2c5527db2072cd7132da158dfe6481761b25c485;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 93b3ee0d2..80783eaa2 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -1,3 +1,4 @@
+---
 - job-template:
     # Template used for running CLM scans
     # Arguements:
@@ -13,209 +14,56 @@
     jdk: '{jdk}'
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
+      - git-scm:
+          refspec: ''
+          branch: '{branch}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 6'
+      - timed: 'H H * * 6'
 
     builders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: 'pom.xml'
-            goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '-Xmx4096m -XX:MaxPermSize=512m'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
-        - check-clm:
-            application-name: '{project-name}'
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: '{mvn-settings}'
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: |
+              clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
+              -Pq
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx4096m -XX:MaxPermSize=512m'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
+      - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
+      - check-clm:
+          application-name: '{project-name}'
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project-name}]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
-- job-template:
-    name: '{project-name}-distribution-{stream}'
-
-    # Required variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
-    # Need to keep jobs that deploy to Nexus at end of build as Maven
-    # projects. Maybe reconsider this once upstream moves deploy to a
-    # separate lifecycle:
-    #     https://issues.apache.org/jira/browse/MNG-5666
-    project-type: maven
-    node: '{build-node}'
-    jdk: '{jdk}'
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: 'integration/distribution'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: 'mvn33'
-        root-pom: 'pom.xml'
-        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -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-distribution-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
-
-- job-template:
-    # Template: {name}-distribution-check-{stream}
-    # Goal: Build a patch and make sure the distribution can deploy with this change
-    # Operation: This job template builds a patch, creates a distribution containing
-    #            the patch, and triggers the distribution deploy test
-
-    name: '{project-name}-distribution-check-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-        - integration-distribution-git-url:
-            git-url: '{git-url}'
-
-    scm:
-        - integration-gerrit-scm:
-            basedir: '$GERRIT_PROJECT'
-            refspec: '$GERRIT_REFSPEC'
-            branch: '{branch}'
-        - integration-distribution-scm:
-            branch: '{branch}'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            # Distro-check jobs typically run within 10 - 30 minutes
-            # with 45 minutes being the occassional edge case.
-            # enforce a 60 minute limit to ensure stuck jobs get
-            # cleared up sooner.
-            build-timeout: '60'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: '**'
-
-    builders:
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -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: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: 'distribution/pom.xml'
-            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - integration-distribution-check
-
-    publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project-name}]'
-        - postbuildscript:
-            builders:
-                - shell: |
-                    #!/bin/bash
-                    mkdir -p $WORKSPACE/archives
-                    cp karaf*.log $WORKSPACE/archives
-            script-only-if-succeeded: False
-            script-only-if-failed: False
-            mark-unstable-if-failed: True
-        - archive:
-            artifacts: '*.zip'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-integration-{stream}'
@@ -235,53 +83,56 @@
     jdk: '{jdk}'
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm:
-            refspec: ''
-            branch: '{branch}'
+      - git-scm:
+          refspec: ''
+          branch: '{branch}'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-            jobs: '{dependencies}'
-            result: 'success'
+      - reverse:
+          jobs: '{dependencies}'
+          result: 'success'
 
     builders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: 'mvn33'
-            goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '{mvn-opts}'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: '{mvn-settings}'
+      - maven-target:
+          maven-version: 'mvn33'
+          goals: |
+              {mvn-goals}
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '{mvn-opts}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '{email-upstream}'
-        - findbugs
-        - jacoco-report
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '{email-upstream}'
+      - findbugs
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-merge-{stream}'
@@ -304,67 +155,73 @@
     jdk: '{jdk}'
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 14
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 0'
-        - gerrit-trigger-patch-merged:
-            server-name: '{server-name}'
-            name: '{project}'
-            branch: '{branch}'
+      - timed: 'H H * * 0'
+      - gerrit-trigger-patch-merged:
+          server-name: '{server-name}'
+          name: '{project}'
+          branch: '{branch}'
 
     prebuilders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: '{mvn-settings}'
 
+    # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
-        maven-name: 'mvn33'
-        goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '{mvn-opts}'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        post-step-run-condition: UNSTABLE
+      maven-name: 'mvn33'
+      goals: >
+          {mvn-goals}
+          -Dmerge
+          -Dstream={stream}
+          {opendaylight-infra-mvn-opts}
+      maven-opts: '{mvn-opts}'
+      settings: '{mvn-settings}'
+      settings-type: cfp
+      global-settings: 'odl-global-settings'
+      global-settings-type: cfp
+      post-step-run-condition: UNSTABLE
 
     postbuilders:
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: deploy-site.xml
-            condition-basedir: workspace
-
-            # The strategy here is intentional to run Maven site:deploy twice
-            # once using regular pom.xml to produce a staged-site which is
-            # then used by deploy-site.xml to push to Nexus. This is a
-            # workaround to Maven Site's default linking code which creates
-            # incorrect URLs for sites due to auto-detection assuming your
-            # project is configured in a certain way which ODL is not.
-            steps:
+      - conditional-step:
+          condition-kind: file-exists
+          condition-filename: deploy-site.xml
+          condition-basedir: workspace
+
+          # The strategy here is intentional to run Maven site:deploy twice
+          # once using regular pom.xml to produce a staged-site which is
+          # then used by deploy-site.xml to push to Nexus. This is a
+          # workaround to Maven Site's default linking code which creates
+          # incorrect URLs for sites due to auto-detection assuming your
+          # project is configured in a certain way which ODL is not.
+          steps:
             - maven-target:
                 maven-version: 'mvn33'
                 pom: pom.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
-                    - '-Xmx2g'
+                  - '-Xmx2g'
                 settings: '{mvn-settings}'
                 settings-type: cfp
                 global-settings: 'odl-global-settings'
@@ -374,26 +231,29 @@
                 pom: deploy-site.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
-                    - '-Xmx2g'
+                  - '-Xmx2g'
                 settings: '{mvn-settings}'
                 settings-type: cfp
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
 
     reporters:
-        - findbugs
+      - findbugs
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project-name}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - jacoco-report
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
+      - trigger:
+          project: 'distribution-merge-{stream}'
+          threshold: SUCCESS
 
 - job-template:
     name: '{project-name}-sonar'
@@ -404,67 +264,75 @@
     jdk: 'openjdk8'
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 7
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - git-scm:
-            refspec: ''
-            branch: 'master'
+      - git-scm:
+          refspec: ''
+          branch: 'master'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * 6'
-        - gerrit-trigger-patch-sonar:
-            server-name: '{server-name}'
-            name: '{project}'
-            # FIXME: Make sure this does not alter Gerrit votes, then update docs.
+      - timed: 'H H * * 6'
+      - gerrit-trigger-patch-sonar:
+          server-name: '{server-name}'
+          name: '{project}'
+          # FIXME: Make sure this does not alter Gerrit votes, then update docs.
 
     builders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: 'mvn33'
-            goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            maven-opts:
-              - '{mvn-opts}'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - maven-target:
-            maven-version: 'mvn33'
-            # We should switch to the recommended configuration of sonar once
-            # JJB adds support for configurating the Sonar wrapper:
-            #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
-            goals: 'sonar:sonar -V -B -Djenkins -Dsonar -Dsonar.host.url=https://sonar.opendaylight.org -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            maven-opts:
-              - '{mvn-opts}'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: '{mvn-settings}'
+      - maven-target:
+          maven-version: 'mvn33'
+          goals: |
+              {mvn-goals}
+              -Dsonar
+              {opendaylight-infra-mvn-opts}
+          maven-opts:
+            - '{mvn-opts}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
+      - maven-target:
+          maven-version: 'mvn33'
+          # We should switch to the recommended configuration of sonar once
+          # JJB adds support for configurating the Sonar wrapper:
+          #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
+          goals: |
+              sonar:sonar
+              -Dsonar
+              -Dsonar.host.url=https://sonar.opendaylight.org
+              {opendaylight-infra-mvn-opts}
+          maven-opts:
+            - '{mvn-opts}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project-name}]'
-        - jacoco-report
-        - findbugs
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - jacoco-report
+      - findbugs
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
@@ -476,84 +344,91 @@
     jdk: '{jdk}'
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 7
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-        - autorelease-release-tag:
-            release-tag: 'validate'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - string:
-            name: CLONE_URL
-            default: '{git-url}/releng/autorelease'
-            description: "Autorelease clone URL"
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - autorelease-release-tag:
+          release-tag: 'validate'
+      - autorelease-release-branch:
+          release-branch: '{branch}'
+      - string:
+          name: CLONE_URL
+          default: '{git-url}/releng/autorelease'
+          description: "Autorelease clone URL"
 
     scm:
-        - git:
-            url: '$CLONE_URL'
-            credentials-id: 'opendaylight-jenkins-ssh'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-                timeout: 60
+      - git:
+          url: '$CLONE_URL'
+          credentials-id: 'opendaylight-jenkins-ssh'
+          refspec: ''
+          branches:
+            - 'origin/{branch}'
+          skip-tag: true
+          submodule:
+            recursive: true
+            timeout: 60
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: '**/*.xml'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**/*.xml'
 
     builders:
-        - jacoco-nojava-workaround
-        - autorelease-checkout-gerrit-patch
-        - autorelease-generate-release-patches
-        # In a perfect world projects should be releasing separately and we consume them
-        # via a project that pulls the release bits from each project from Nexus.
-        # Keep the patches compatible with that ideal, but apply an edit
-        # to enable building in a single maven reactor afterwards.
-        - autorelease-fix-relative-paths
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: validate-pom.xml
-            goals: 'clean install dependency:tree -V -B -T1.5C -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '-Xmx8g'
-            settings: 'autorelease-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: 'pom.xml'
-            goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: 'autorelease-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - autorelease-sys-stats
+      - jacoco-nojava-workaround
+      - autorelease-checkout-gerrit-patch
+      - autorelease-generate-release-patches
+      # In a perfect world projects should be releasing separately and we consume them
+      # via a project that pulls the release bits from each project from Nexus.
+      # Keep the patches compatible with that ideal, but apply an edit
+      # to enable building in a single maven reactor afterwards.
+      - autorelease-fix-relative-paths
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: validate-pom.xml
+          goals: |
+              clean install dependency:tree
+              -T1.5C
+              -Pq
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx8g'
+          settings: 'autorelease-settings'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: |
+              clean validate
+              -Pq
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+          settings: 'autorelease-settings'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[autorelease] [{project-name}]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[autorelease] [{project-name}]'
+      - opendaylight-infra-shiplogs:
+          maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -572,52 +447,56 @@
     jdk: '{jdks}'
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: 7
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-submitted:
-            server: '{server-name}'
-            project: '{project}'
-            branch: '{branch}'
-            files: '**'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
 
     builders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: '{mvn-version}'
-            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-                - '{mvn-opts}'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'odl-global-settings'
+          settings-file: '{mvn-settings}'
+      - maven-target:
+          maven-version: '{mvn-version}'
+          goals: |
+              {mvn-goals}
+              -Dstream={stream}
+              {opendaylight-infra-mvn-opts}
+          java-opts:
+            - '{mvn-opts}'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'odl-global-settings'
+          global-settings-type: cfp
 
     publishers:
-        - findbugs
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[{project-name}]'
-        - jacoco-report
-        - opendaylight-infra-shiplogs:
-            maven-version: '{mvn-version}'
+      - findbugs
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - jacoco-report
+      - opendaylight-infra-shiplogs:
+          maven-version: '{mvn-version}'