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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 4fe432fb6..44161b7b5 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -15,20 +15,20 @@
 
 - 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:
@@ -43,6 +43,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -65,22 +66,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
@@ -88,8 +94,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -104,6 +112,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -125,14 +134,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
     #
@@ -141,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:
@@ -165,6 +184,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -183,14 +203,19 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+            !include-raw-escape:
+                - include-raw-jjb-update.sh
 
     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
     #
@@ -200,10 +225,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -224,15 +249,17 @@
 
     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
+    node: dynamic_verify
 
     project-type: freestyle
 
@@ -252,11 +279,14 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-check-poms.sh
+            !include-raw-escape:
+                - include-raw-check-poms.sh
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 
 ###
@@ -275,18 +305,23 @@
 
     logrotate:
         daysToKeep: 7
-        numToKeep: 10
+        numToKeep: 3
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameters:
+            project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
-        - git-scm:
+        - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            branch: 'master'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
@@ -294,21 +329,37 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
-            jobs: 'builder-merge'
-            result: 'success'
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'republish'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'releng/builder'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/master'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: src/**
+                    - compare-type: ANT
+                      pattern: pom.xml
 
     maven:
         maven-name: '{mvn33}'
         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'
@@ -329,8 +380,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: 'master'
+            refspec: 'refs/heads/master'
 
     scm:
         - gerrit-trigger-scm:
@@ -345,6 +398,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -370,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}'