X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsnbi%2Fsnbi.yaml;h=6d8765c4d1869007553428f5550f95e29d7c896e;hb=5cf5961a3b764c82fbc22d1a03e6bff1aedbb7b5;hp=953354f3f6689a6ee55d768017b340166ec6d0f4;hpb=8e01c22efc521188260ebb84b049d9db64e26ca8;p=releng%2Fbuilder.git

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index 953354f3f..ac63cb235 100644
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -6,36 +6,49 @@
 - project:
     name: snbi
     jobs:
+        - '{name}-clm-{stream}'
+        - '{name}-distribution-{stream}'
+        - '{name}-distribution-check-{stream}'
+        - '{name}-integration-{stream}'
+        - '{name}-periodic-{stream}'
+        - '{name}-validate-autorelease-{stream}'
         - 'snbi-verify-{stream}'
         - 'snbi-merge-{stream}'
-        - 'snbi-daily-{stream}'
-        - 'snbi-distribution-{stream}'
-        - 'snbi-integration-{stream}'
         - 'snbi-sonar'
-        - 'snbi-clm-{stream}'
 
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jdk: openjdk8
+            jdks:
+                - openjdk8
+            disable_autorelease: False
+            disable_distribution_check: False
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
+            disable_autorelease: False
+            disable_distribution_check: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
             jdks:
                 - openjdk7
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
+            disable_autorelease: True
+            disable_distribution_check: True
 
     project: 'snbi'
+    mvn-settings: 'snbi-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream}'
+    email-upstream: '[snbi] [odlparent]'
 
 # For the Job templates below replace instances of:
 # PROJECT_SHORTNAME with your project name (eg. circuitsw)
@@ -69,28 +82,23 @@
             values: '{obj:jdks}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        daysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -98,25 +106,30 @@
             branch: '{branch}'
 
     builders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'snbi-settings'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
-            goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dstream={stream}'
+            goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dstream={stream}'
             java-opts:
                 - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: '{snbi-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'snbi-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - findbugs
         - email-notification:
             email-prefix: '[snbi]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'snbi-merge-{stream}'
@@ -135,46 +148,48 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'snbi'
             branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'snbi-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dstream={stream}'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{snbi-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'snbi-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: UNSTABLE
 
     postbuilders:
@@ -193,24 +208,30 @@
             - maven-target:
                 maven-version: '{mvn33}'
                 pom: pom.xml
-                goals: 'site:deploy -Dstream={stream}'
+                goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{snbi-settings}'
-                global-settings: '{odl-global-settings}'
+                settings: 'snbi-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
             - maven-target:
                 maven-version: '{mvn33}'
                 pom: deploy-site.xml
-                goals: 'site:deploy -Dstream={stream}'
+                goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{snbi-settings}'
-                global-settings: '{odl-global-settings}'
+                settings: 'snbi-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
 
     reporters:
         - findbugs
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - email-notification:
             email-prefix: '[snbi]'
         - maven-deploy:
@@ -218,205 +239,16 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
-
-- job-template:
-    name: 'snbi-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # The purpose of this job template is to setup a daily/nightly
-    # builder and pushes to Sonar analysis.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: maven
-    node: dynamic_verify
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H H * * *'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{snbi-settings}'
-        global-settings: '{odl-global-settings}'
-
-    reporters:
-        - findbugs
-
-    publishers:
-        - email-notification:
-            email-prefix: '[snbi]'
-        - jacoco-report
-
-- job-template:
-    name: 'snbi-distribution-{stream}'
-
-    # Required variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: maven
-    node: dynamic_merge
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: 'integration/distribution'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - reverse:
-            jobs: '{project}-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{integration-settings}'
-        global-settings: '{odl-global-settings}'
-
-    publishers:
-        - email-notification:
-            email-prefix: '[{project}]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-
-- job-template:
-    name: 'snbi-integration-{stream}'
-    disabled: false
-
-    # Job template for ODL integration verify jobs
-    #
-    # This is similar to a normal verify job, but it runs
-    # when a project that's a dependency of your project
-    # is successfully built.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: maven
-    node: dynamic_merge
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - reverse:
-            jobs: 'odlparent-merge-{stream}'
-            result: 'success'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{snbi-settings}'
-        global-settings: '{odl-global-settings}'
-
-    reporters:
-        - findbugs
-
-    publishers:
-        - email-notification:
-            email-prefix: '[snbi] [odlparent]'
-        - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'snbi-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -425,40 +257,41 @@
         artifactNumToKeep: '1'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: 'master'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: 'H H * * *'
+        - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
             name: 'snbi'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'snbi-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dsonar'
+        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dsonar'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{snbi-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'snbi-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -470,58 +303,6 @@
         - email-notification:
             email-prefix: '[snbi]'
         - jacoco-report
-
-- job-template:
-    name: 'snbi-clm-{stream}'
-
-    project-type: maven
-    node: dynamic_verify
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: '@weekly'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{snbi-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
-        settings: '{snbi-settings}'
-        global-settings: '{odl-global-settings}'
-
-    postbuilders:
-        - check-clm:
-            application-name: snbi
-
-    publishers:
-        - email-notification:
-            email-prefix: '[snbi]'
+        - archive-build:
+            maven-version: '{mvn33}'