X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=8bd83398a4b730ee73cd4e85e43f91e0d0716f7a;hb=85ec5cecdd1e7290115692c297ae6b364b1a3dcf;hp=c574760902795cfee2f60c335a1455e0c2e8cbf4;hpb=3189ff4e231fa5a5433fd0cf208fd9f6aa625a36;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index c57476090..8bd83398a 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -6,12 +6,43 @@
         - 'builder-merge'
         - 'builder-weekly'
         - 'builder-check-poms'
+        - 'builder-verify-packer-{platforms}-{templates}'
+        - 'builder-merge-packer-{platforms}-{templates}'
+
+    platforms:
+        - centos
+        - ubuntu-14.04
+
+    templates:
+        - devstack
+        - docker
+        - gbp
+        - java-builder
+        - mininet
+        - mininet-ovs-2.3
+        - mininet-ovs-2.5
+        - robot
+
+    exclude:
+        - platforms: centos
+          templates: gbp
+        - platforms: centos
+          templates: mininet
+        - platforms: centos
+          templates: mininet-ovs-2.3
+        - platforms: centos
+          templates: mininet-ovs-2.5
+        - platforms: ubuntu-14.04
+          templates: java-builder
+        - platforms: centos
+          templates: gbp
+        - platforms: ubuntu-14.04
+          templates: robot
 
-        # Maven Sites
-        - 'builder-site-publish'
-        - 'builder-site-verify'
-
+    project-type: freestyle
+    archive-artifacts: '**/*.log'
     project: 'releng/builder'
+    build-timeout: '60'
 
 - job-template:
     name: builder-verify-jjb
@@ -20,26 +51,23 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 7
+        daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             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:
@@ -67,47 +95,41 @@
     builders:
         - shell: |
             pip freeze
-            python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test --recursive -o archives/job_output jjb/
+            jenkins-jobs -l DEBUG 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}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: builder-verify-python
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             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:
@@ -143,8 +165,8 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-merge'
@@ -157,29 +179,23 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 7
-        numToKeep: 3
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             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:
@@ -201,15 +217,16 @@
                       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}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: 'builder-weekly'
@@ -224,24 +241,22 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 7
-        numToKeep: 3
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        daysToKeep: 14
 
     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'
@@ -253,25 +268,28 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: builder-check-poms
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 1
-        numToKeep: 1
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        daysToKeep: 14
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 1'
@@ -284,150 +302,120 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
-        - archive-build:
-            maven-version: '{mvn33}'
-
-
-###
-### Maven Sites
-###
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - 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
+    name: 'builder-verify-packer-{platforms}-{templates}'
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
+    concurrent: true
 
     logrotate:
-        daysToKeep: 7
-        numToKeep: 3
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
-            branch: 'master'
-            refspec: 'refs/heads/master'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+            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:
-                - change-merged-event
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'republish'
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'releng/builder'
+                project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
-                      pattern: src/**
-                    - compare-type: ANT
-                      pattern: pom.xml
+                      pattern: 'packer/**'
 
-    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'
+    builders:
+        - packer-validate:
+            platform: '{platforms}'
+            template: '{templates}'
 
     publishers:
         - email-notification:
-            email-prefix: '[releng]'
-        - archive-build:
-            maven-version: '{mvn33}'
+            email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
-    name: 'builder-site-verify'
-    node: dynamic_verify
+    name: 'builder-merge-packer-{platforms}-{templates}'
+    project-type: freestyle
+    node: centos7-java-builder-2c-8g
     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
+        daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            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:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
+                - change-merged-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng/builder'
                 branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/master'
                 file-paths:
                     - compare-type: ANT
-                      pattern: src/**
-                    - compare-type: ANT
-                      pattern: pom.xml
+                      pattern: 'packer/**'
 
-    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:
+        - packer-validate:
+            platform: '{platforms}'
+            template: '{templates}'
+        - packer-build:
+            platform: '{platforms}'
+            template: '{templates}'
 
     publishers:
         - email-notification:
-            email-prefix: '[releng]'
-        - archive-build:
-            maven-version: '{mvn33}'
+            email-prefix: '[{project}]'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'