X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates.yaml;h=9bdbd51d26f36d2910b080c886952f32999dd3fa;hb=0a3c84bce0b23dfa756cf4ebfa275eabc344b1b3;hp=c39080eca03880b80cf34e89f865d54204345a06;hpb=8b8767ffb5eefe51d96d014a5844b1cc36f7abc8;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index c39080eca..9bdbd51d2 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,223 +1,118 @@
+---
 - job-template:
-    name: '{name}-release-java'
+    name: '{project-name}-release-java'
 
     # Job template for producing a release candidate by creating a staging repo
     # in Nexus.
 
-    project-type: maven
-    node: dynamic_merge
+    project-type: freestyle
+    node: '{build-node}'
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '30'
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 30
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - build-tag
-        - stage-id-parameter:
-            stage-id: '{stage-id}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - build-tag
+      - stage-id-parameter:
+          stage-id: '{stage-id}'
 
     scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            branches:
-                - '$BUILD_TAG'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
+      - git:
+          credentials-id: 'opendaylight-jenkins-ssh'
+          url: '$GIT_BASE'
+          branches:
+            - '$BUILD_TAG'
+          skip-tag: true
+          shallow-clone: true
+          wipe-workspace: true
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{autorelease-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean deploy -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - releng-stage-release
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    builders:
+      - wipe-org-opendaylight-repo
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: 'autorelease-settings'
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: >
+              clean deploy -V -B
+              -Dmaven.repo.local=/tmp/r
+              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Djenkins
+              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m'
+          settings: 'autorelease-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - releng-stage-release
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log'
-        - email-notification:
-            email-prefix: '[releng]'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - lf-infra-publish
 
 
 - job-template:
-    name: '{name}-publish-p2repo'
+    name: '{project-name}-publish-p2repo'
 
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
-    project-type: maven
-    node: dynamic_merge
-    jdk: '{jdk}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - p2zip-parameter
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - releng-fetch-p2zip-if-necessary:
-            maven-version: '{mvn33}'
-            settings: '{project-settings}'
-            global-settings: '{odl-global-settings}'
-        - releng-generate-p2pom
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
-        settings: '{project-settings}'
-        global-settings: '{odl-global-settings}'
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - releng-update-p2composite-metadata:
-            maven-version: '{mvn33}'
-            settings: '{project-settings}'
-            global-settings: '{odl-global-settings}'
-
-    publishers:
-        - email-notification:
-            email-prefix: '[releng]'
-
-- job-template:
-    name: '{name}-verify-python-{stream}'
-
-    # Job template for python verify jobs
-    #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
-    #
-    # Required Variables:
-    #     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.
-
-    project-type: freestyle
-    node: dynamic_verify
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '-1'
-        artifactDaysToKeep: '-1'
-        artifactNumToKeep: '-1'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            basedir: 'repo'
-            refspec: '$GERRIT_REFSPEC'
-            branches:
-                - 'origin/$GERRIT_BRANCH'
-            skip-tag: true
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: '{toxdir}/**'
-
-    builders:
-        - shell: |
-            virtualenv $WORKSPACE/venv-tox
-            source $WORKSPACE/venv-tox/bin/activate
-            pip install --upgrade pip
-            pip install --upgrade tox argparse
-            pip freeze
-            cd $WORKSPACE/repo/{toxdir}
-            tox
-
-    publishers:
-        - email-notification:
-            email-prefix: '[{project}]'
-
-- job-template:
-    name: '{name}-merge-rtd-{stream}'
-    # Template for ReadTheDocs triggering
-
     project-type: freestyle
-    node: dynamic_verify
-    concurrent: false
+    node: '{build-node}'
+    jdk: '{jdk}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - p2zip-parameter
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     builders:
-        - shell: |
-            curl -X POST https://readthedocs.org/build/{rtdproject}
+      - wipe-org-opendaylight-repo
+      - jacoco-nojava-workaround
+      - releng-fetch-p2zip-if-necessary:
+          maven-version: 'mvn33'
+          settings: '{mvn-settings}'
+          global-settings: 'global-settings'
+      - releng-generate-p2pom
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - releng-update-p2composite-metadata:
+          maven-version: 'mvn33'
+          settings: '{mvn-settings}'
+          global-settings: 'global-settings'
 
     publishers:
-        - email-notification:
-            email-prefix: '[{project}]'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - lf-infra-publish