X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=aab6d76595285d2bb508594b04e7f80d8ba703b4;hb=62025df552b620bf9dfcd8eaec5530b827d086a5;hp=b9b804292f80d5ddb1774ace6c9aec3a17a74d29;hpb=e28c08375343da89f009d702ab2df2f901e03086;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index b9b804292..aab6d7659 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -3,8 +3,8 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    project-type: maven
-    node: dynamic_autorelease
+    project-type: freestyle
+    node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
     logrotate:
@@ -12,8 +12,11 @@
         artifactDaysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - autorelease-release-tag:
             release-tag: '{next-release-tag}'
         - autorelease-release-branch:
@@ -21,7 +24,7 @@
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             refspec: ''
             branches:
@@ -29,65 +32,63 @@
             skip-tag: true
             submodule:
                 recursive: true
+                timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '1440'
 
     triggers:
         - timed: 'H 0 * * *'
 
-    prebuilders:
+    builders:
         - wipe-local-maven-repo
         - jacoco-nojava-workaround
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-cfp:
-            autorelease-settings: '{autorelease-settings}'
-            odl-global-settings: '{odl-global-settings}'
+            autorelease-settings: 'autorelease-settings'
+            odl-global-settings: 'odl-global-settings'
         - autorelease-generate-taglist
         - autorelease-distribute-taglist
         - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean deploy -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-        maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        settings-type: cfp
-        global-settings: '{odl-global-settings}'
-        global-settings-type: cfp
-        automatic-archiving: true
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
+        - maven-target:
+              maven-version: '{mvn33}'
+              pom: 'pom.xml'
+              goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
+              java-opts:
+                - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+              settings: 'autorelease-settings'
+              settings-type: cfp
+              global-settings: 'odl-global-settings'
+              global-settings-type: cfp
         - autorelease-maven-deploy
-        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
             maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'autorelease-settings'
+            global-settings: 'odl-global-settings'
         - autorelease-maven-sources-post-process
         - autorelease-sys-stats
+        - shell: |
+            mkdir -p archives/
+            cp *.log *.prop $_
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.bundle,patches/*.patch,patches/*.log'
-    - email-notification:
-        email-prefix: '[autorelease]'
-    - trigger-parameterized-builds:
-        - project: 'integration-distribution-test-{integration-test}'
-          condition: UNSTABLE_OR_BETTER
-          property-file: variables.prop
-          fail-on-missing: true
+        - email-notification:
+            email-prefix: '[autorelease]'
+        - trigger-parameterized-builds:
+            - project: 'integration-distribution-test-{integration-test}'
+              condition: UNSTABLE_OR_BETTER
+              property-file: variables.prop
+              fail-on-missing: true
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -96,8 +97,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - string:
             name: REPORT_DIR
             default: '$WORKSPACE/project-reports'
@@ -105,7 +109,7 @@
 
     scm:
         - git:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
             refspec: ''
             branches:
@@ -115,13 +119,8 @@
                 recursive: true
 
     wrappers:
-        - timeout:
-            type: absolute
-            timeout: 30
-            fail: true
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '30'
 
     triggers:
         - timed: '0 0 * * 0'
@@ -135,130 +134,17 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.log,project-reports/*.log'
-    - email-ext:
-        attachments: 'project-reports/*.log'
-        recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
-        reply-to: dev@lists.opendaylight.org
-        content-type: default
-        subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
-        body: |
-            This is a project report generated on $DATE listing the commit
-            history of ODL projects for the past week. See attached
-            git-report.log
-
-            Archive also available on Jenkins at $BUILD_URL
-        always: true
-
-###
-### Maven Sites
-###
-
-- job-template:
-    name: 'autorelease-site-publish-{stream}'
-    node: dynamic_merge
-    concurrent: false
-    jdk: 'openjdk8'
-
-    # This job's purpose is to publish maven site
-
-    project-type: maven
-
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
-
-    scm:
-    - gerrit-trigger-scm:
-        credentials-id: '{ssh-credentials}'
-        refspec: ''
-        choosing-strategy: 'default'
-
-    wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
-
-    triggers:
-    - autorelease-trigger-patch-site-merged:
-        name: '{project}'
-        branch: '{branch}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'site.xml'
-        goals: 'site:site site:deploy -Dstream={stream}'
-        maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
-        settings-type: cfp
-        global-settings: '{odl-global-settings}'
-        global-settings-type: cfp
-
-    publishers:
-    - email-notification:
-        email-prefix: '[releng]'
-
-- job-template:
-    name: 'autorelease-site-verify-{stream}'
-    node: dynamic_verify
-    concurrent: true
-    jdk: 'openjdk8'
-
-    # This job's purpose is to verify maven site configuration
-
-    project-type: maven
-
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
-
-    scm:
-    - gerrit-trigger-scm:
-        credentials-id: '{ssh-credentials}'
-        refspec: '$GERRIT_REFSPEC'
-        choosing-strategy: 'gerrit'
-
-    wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
-
-    triggers:
-    - autorelease-trigger-patch-site-submitted:
-        name: '{project}'
-        branch: '{branch}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'site.xml'
-        goals: 'site:site -Dstream={stream}'
-        maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
-        settings-type: cfp
-        global-settings: '{odl-global-settings}'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-prefix: '[releng]'
+        - email-ext:
+            attachments: 'project-reports/*.log'
+            recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
+            reply-to: dev@lists.opendaylight.org
+            content-type: default
+            subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
+            body: |
+                This is a project report generated on $DATE listing the commit
+                history of ODL projects for the past week. See attached
+                git-report.log
+                Archive also available on Jenkins at $BUILD_URL
+            always: true
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'