X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=c1dd718f13d3a5f1e23cf89b97889b8a5a1cbc0b;hb=13951a33d31f2992d0a255173ae366634b2fd9a8;hp=f479594b63fe38f151fb6e54dd2b3e9b66bb98bc;hpb=73dbe915f1f57685c387fc1db5921ae40b8ee0a9;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index f479594b6..c1dd718f1 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -7,42 +7,36 @@
         - 'builder-weekly'
         - 'builder-check-poms'
 
-        # Maven Sites
-        - 'builder-site-publish'
-        - 'builder-site-verify'
-
     project: 'releng/builder'
 
 - 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:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     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,46 +59,50 @@
 
     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
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     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 +124,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 +148,30 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     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:
@@ -183,15 +189,21 @@
                       pattern: jjb-templates/**
 
     builders:
-        - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+        - shell: |
+            pip freeze
+            jenkins-jobs --version
+            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
     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
     #
@@ -201,39 +213,42 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     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
+    node: dynamic_verify
 
     project-type: freestyle
 
@@ -243,154 +258,27 @@
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
-    wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H H * * 1'
-
-    builders:
-        - shell:
-            !include-raw-escape include-raw-check-poms.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[releng]'
-
-
-###
-### Maven Sites
-###
-
-- job-template:
-    name: 'builder-site-publish'
-    node: dynamic_merge
-    concurrent: false
-    jdk: 'openjdk8'
-
-    # This job's purpose is to publish maven site
-
-    project-type: maven
-
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - 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}'
-
-    publishers:
-        - email-notification:
-            email-prefix: '[releng]'
-
-- job-template:
-    name: 'builder-site-verify'
-    node: dynamic_verify
-    concurrent: true
-    jdk: 'openjdk8'
-
-    # This job's purpose is to verify maven site configuration
-
-    project-type: maven
-
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            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
+        - timed: 'H H * * 1'
 
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'site:site -Dstream=master'
-        maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
+    builders:
+        - shell:
+            !include-raw-escape:
+                - include-raw-check-poms.sh
 
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'