X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=b6becab679466b92cb74de21c3856df8b82cc644;hb=5d27acb6f73ee0e53234a90b95f951b648079815;hp=91fd19ca0ab4a4e97d08c0a76144bb86138ca24a;hpb=02de1d46c71d96e4b670e81e0dc4f39d25e0bc19;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 91fd19ca0..b6becab67 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -3,15 +3,17 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    project-type: maven
+    project-type: freestyle
     node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        artifactDaysToKeep: '14'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '30'
 
     parameters:
+        - maven-exec:
+            maven-version: 'mvn33'
         - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
@@ -26,9 +28,10 @@
         - git:
             credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
-            refspec: ''
+            refspec: '$GERRIT_REFSPEC'
             branches:
-                - 'origin/{branch}'
+                - '$GERRIT_BRANCH'
+            choosing-strategy: 'gerrit'
             skip-tag: true
             submodule:
                 recursive: true
@@ -41,49 +44,58 @@
     triggers:
         - timed: 'H 0 * * *'
 
-    prebuilders:
+    builders:
+        # force jenkins install of maven version before any shell scripts use it
+        - maven-target:
+            maven-version: 'mvn33'
+            goals: '-version'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - wipe-local-maven-repo
         - jacoco-nojava-workaround
         - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-determine-merge-order
         - autorelease-cfp:
             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 -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'
-        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
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             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-recipients: '{email-recipients}'
+            email-prefix: '[autorelease]'
+        - trigger-parameterized-builds:
+            - project: 'integration-distribution-test-{integration-test}'
+              condition: UNSTABLE_OR_BETTER
+              property-file: variables.jenkins-trigger
+              fail-on-missing: true
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
@@ -91,11 +103,9 @@
     project-type: freestyle
     node: centos7-java-builder-2c-8g
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -112,9 +122,10 @@
         - git:
             credentials-id: 'opendaylight-jenkins-ssh'
             url: '$GIT_BASE'
-            refspec: ''
+            refspec: '$GERRIT_REFSPEC'
             branches:
-                - 'origin/{branch}'
+                - '$GERRIT_BRANCH'
+            choosing-strategy: 'gerrit'
             skip-tag: true
             submodule:
                 recursive: true
@@ -132,127 +143,21 @@
             properties-file: variables.prop
         - autorelease-generate-project-report
         - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-determine-merge-order
         - 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: centos7-java-builder-2c-8g
-    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:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-    - gerrit-trigger-scm:
-        refspec: ''
-        choosing-strategy: 'default'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    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: centos7-java-builder-2c-8g
-    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:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-    - gerrit-trigger-scm:
-        refspec: '$GERRIT_REFSPEC'
-        choosing-strategy: 'gerrit'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    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'