X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freservation%2Freservation.yaml;h=2c5cec299ac702d76f73d5c0cc652ee92ac4117f;hb=140a6a4db5df25f77c47689e52b00ae2c38098dc;hp=dda6111c7281f5404d82b6444d08d75e8585aa0d;hpb=98c6bd79cbef778468df5d7071aebcc1f55a9ad9;p=releng%2Fbuilder.git

diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml
index dda6111c7..2c5cec299 100644
--- a/jjb/reservation/reservation.yaml
+++ b/jjb/reservation/reservation.yaml
@@ -77,10 +77,7 @@
             values: '{obj:jdks}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        daysToKeep: '14'
 
     parameters:
         - project-parameter:
@@ -108,19 +105,20 @@
             branch: '{branch}'
 
     builders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dstream={stream}'
+            goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dstream={stream}'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{reservation-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'reservation-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - archive-artifacts:
@@ -129,6 +127,8 @@
         - email-notification:
             email-prefix: '[reservation]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-merge-{stream}'
@@ -171,6 +171,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - timed: 'H H * * 0'
@@ -179,19 +181,20 @@
             branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dmerge -Dstream={stream}'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'reservation-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: UNSTABLE
 
     postbuilders:
@@ -210,19 +213,23 @@
             - maven-target:
                 maven-version: '{mvn33}'
                 pom: pom.xml
-                goals: 'site:deploy -Dstream={stream}'
+                goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{reservation-settings}'
-                global-settings: '{odl-global-settings}'
+                settings: 'reservation-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
             - maven-target:
                 maven-version: '{mvn33}'
                 pom: deploy-site.xml
-                goals: 'site:deploy -Dstream={stream}'
+                goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{reservation-settings}'
-                global-settings: '{odl-global-settings}'
+                settings: 'reservation-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -237,6 +244,8 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-periodic-{stream}'
@@ -276,24 +285,27 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - timed: '@daily'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'reservation-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -302,6 +314,8 @@
         - email-notification:
             email-prefix: '[reservation]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-distribution-{stream}'
@@ -335,6 +349,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - reverse:
@@ -342,18 +358,19 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install -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-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'integration-distribution-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     publishers:
         - email-notification:
@@ -362,6 +379,8 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Template: integration-patch-distribution-{stream}
 # Goal: Build a patch and make sure the distribution can deploy with this change
@@ -378,8 +397,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '14'
-        numToKeep: '10'
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
@@ -407,6 +426,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - gerrit:
@@ -436,23 +457,26 @@
                 notbuilt: false
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -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: '{reservation-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'reservation-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
-        goals: 'clean install -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install -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: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'reservation-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         ignore-upstream-changes: true
         post-step-run-condition: 'SUCCESS'
 
@@ -466,6 +490,8 @@
             artifacts: 'karaf_console.log'
         - email-notification:
             email-prefix: '[reservation]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-integration-{stream}'
@@ -506,6 +532,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - reverse:
@@ -513,19 +541,20 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'reservation-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -534,6 +563,8 @@
         - email-notification:
             email-prefix: '[reservation] [odlparent] [controller] [yangtools] [groupbasedpolicy]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-sonar'
@@ -564,6 +595,8 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - timed: 'H H * * 6'
@@ -571,19 +604,20 @@
             name: 'reservation'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Djenkins -Dsonar'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'reservation-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -595,6 +629,8 @@
         - email-notification:
             email-prefix: '[reservation]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-clm-{stream}'
@@ -625,23 +661,26 @@
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - timed: 'H H * * 6'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{reservation-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'reservation-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
-        settings: '{reservation-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'reservation-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
@@ -651,6 +690,8 @@
     publishers:
         - email-notification:
             email-prefix: '[reservation]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'reservation-validate-autorelease-{stream}'
@@ -678,8 +719,6 @@
             release-tag: 'validate'
         - autorelease-release-branch:
             release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
         - string:
             name: CLONE_URL
             default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
@@ -688,28 +727,31 @@
     scm:
         - git:
             url: '$CLONE_URL'
+            credentials-id: '{ssh-credentials}'
             refspec: ''
             branches:
                 - 'origin/{branch}'
             skip-tag: true
             submodule:
                 recursive: true
-                timeout: 15
+                timeout: 60
 
     wrappers:
         - autorelease-build-timeout
         - ssh-agent-credentials:
             users:
                 - '{ssh-credentials}'
+        - openstack:
+            single-use: true
 
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
@@ -728,26 +770,29 @@
                       pattern: '**/*.xml'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
         - maven-target:
             maven-version: '{mvn33}'
             pom: validate-pom.xml
-            goals: 'clean install -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: 'clean install -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
             - '-Xmx8g'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean validate -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean validate -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'autorelease-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         automatic-archiving: false
         post-step-run-condition: UNSTABLE
 
@@ -757,4 +802,6 @@
     publishers:
         - email-notification:
             email-prefix: '[autorelease] [reservation]'
+        - archive-build:
+            maven-version: '{mvn33}'