X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=44161b7b55c5496d0217c862794fbaac8c382afb;hb=55576d2b2c17077b882c343fc8866faa6376c89c;hp=8ce116a7faa95650a916c6ccc93a4bf57932f7b1;hpb=e38f6ab50b2baef265bb8d0ab652a93b574029f0;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8ce116a7f..44161b7b5 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -20,16 +20,15 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        daysToKeep: 7
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -44,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -68,14 +68,16 @@
         - shell: |
             pip freeze
             python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test --recursive -o job_output jjb/
+            jenkins-jobs test --recursive -o archives/job_output jjb/
+            gzip archives/job_output/*
+
         - releng-check-unicode
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'job_output/*'
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: builder-verify-python
@@ -84,7 +86,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
@@ -92,8 +94,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -108,6 +112,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -139,6 +144,8 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'builder-merge'
@@ -151,16 +158,18 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -175,6 +184,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -199,9 +209,12 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'builder-weekly'
+    disabled: true
     node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
@@ -212,10 +225,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -241,6 +254,8 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: builder-check-poms
@@ -270,6 +285,8 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 
 ###
@@ -288,15 +305,17 @@
 
     logrotate:
         daysToKeep: 7
-        numToKeep: 10
+        numToKeep: 3
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -333,12 +352,14 @@
         root-pom: 'pom.xml'
         goals: 'site:site site:deploy -Dstream=master'
         maven-opts: '-Xmx1024m'
-        settings: '{releng-builder-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'releng-builder-settings'
+        global-settings: 'odl-global-settings'
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'builder-site-verify'
@@ -359,8 +380,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -375,6 +398,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -400,9 +424,11 @@
         root-pom: 'pom.xml'
         goals: 'site:site -Dstream=master'
         maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'autorelease-settings'
+        global-settings: 'odl-global-settings'
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'