Merge "Add restconf feature to Armoury CSIT jobs"

[releng/builder.git] / jjb / autorelease / autorelease-templates.yaml

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index aab6d76595285d2bb508594b04e7f80d8ba703b4..b6becab679466b92cb74de21c3856df8b82cc644 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -7,11 +7,13 @@
     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
@@ -42,9 +45,18 @@
         - timed: 'H 0 * * *'
 
     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'
@@ -52,7 +64,7 @@
         - autorelease-distribute-taglist
         - autorelease-generate-release-patches
         - maven-target:
-              maven-version: '{mvn33}'
+              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:
@@ -64,7 +76,7 @@
         - 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
@@ -75,14 +87,15 @@
 
     publishers:
         - 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.prop
+              property-file: variables.jenkins-trigger
               fail-on-missing: true
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
@@ -90,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:
@@ -111,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
@@ -131,6 +143,7 @@
             properties-file: variables.prop
         - autorelease-generate-project-report
         - shell: "./scripts/list-project-dependencies.sh"
+        - autorelease-determine-merge-order
         - autorelease-sys-stats
 
     publishers:
@@ -147,4 +160,4 @@
                 Archive also available on Jenkins at $BUILD_URL
             always: true
         - opendaylight-infra-shiplogs:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'