X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=e796aa2b2e5c26adf6f40d3504e8cf550832acba;hb=dcb41f639bc14ea0db28f09ff3a4516892ab5d72;hp=55b7cbb09d601ba3a0468a7fb08c8d3781b35bd8;hpb=d1aa563e10ca13def7f557e5c45bfc10f0cfc9ba;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 55b7cbb09..e796aa2b2 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -15,34 +15,33 @@
 
 - job-template:
     name: builder-verify-jjb
+    node: jjbuilder
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        daysToKeep: 7
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -65,23 +64,27 @@
 
     builders:
         - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
             pip freeze
             python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test jjb/
+            jenkins-jobs test --recursive -o archives/job_output jjb/
+            gzip archives/job_output/*
+
         - releng-check-unicode
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: builder-verify-python
+    node: dynamic_verify
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
@@ -89,22 +92,23 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -126,14 +130,22 @@
 
     builders:
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
+            pip freeze
+            pip install flake8
             flake8 scripts/
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'builder-merge'
+    node: jjbuilder
 
     # builder-merge job to run JJB update
     #
@@ -142,30 +154,31 @@
     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:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -190,9 +203,13 @@
     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
     #
@@ -202,10 +219,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -213,25 +230,24 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             branch: 'master'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 0'
 
     builders:
         - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs --flush-cache update jjb/
+            jenkins-jobs --flush-cache update --recursive jjb/
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: builder-check-poms
@@ -246,9 +262,8 @@
         artifactNumToKeep: -1
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 1'
@@ -261,6 +276,8 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 
 ###
@@ -279,26 +296,26 @@
 
     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:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -324,12 +341,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'
@@ -350,22 +369,23 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -391,9 +411,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}'