X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=3a014250ee9a749859f16d2b0369967808951e88;hb=71144baa6229c7226d9afdceed8b2e0ea3596b34;hp=dbd407b025988fb7607fbe7c88007d93a758e29c;hpb=041ef4fe1d589f839dea846b9d74cdea63d40170;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index dbd407b02..3a014250e 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -77,10 +77,7 @@
             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:
@@ -92,15 +89,12 @@
 
     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:
@@ -108,19 +102,20 @@
             branch: '{branch}'
 
     builders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
         - maven-target:
             maven-version: '{mvn33}'
             pom: 'pom.xml'
             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: '{sxp-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'sxp-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - archive-artifacts:
@@ -129,6 +124,8 @@
         - email-notification:
             email-prefix: '[sxp]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-merge-{stream}'
@@ -162,15 +159,12 @@
 
     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'
@@ -179,19 +173,20 @@
             branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         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: '{sxp-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'sxp-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: UNSTABLE
 
     postbuilders:
@@ -213,16 +208,20 @@
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{sxp-settings}'
-                global-settings: '{odl-global-settings}'
+                settings: 'sxp-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 -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{sxp-settings}'
-                global-settings: '{odl-global-settings}'
+                settings: 'sxp-settings'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -237,6 +236,8 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-periodic-{stream}'
@@ -267,33 +268,31 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '@daily'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{sxp-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'sxp-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -302,6 +301,8 @@
         - email-notification:
             email-prefix: '[sxp]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-distribution-{stream}'
@@ -326,15 +327,12 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -342,18 +340,19 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{integration-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'integration-distribution-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     publishers:
         - email-notification:
@@ -362,6 +361,8 @@
             id: ''
             unique-version: true
             deploy-unstable: false
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Template: integration-patch-distribution-{stream}
 # Goal: Build a patch and make sure the distribution can deploy with this change
@@ -394,19 +395,15 @@
 
     scm:
         - integration-gerrit-scm:
-            credentials-id: '{ssh-credentials}'
             basedir: '$GERRIT_PROJECT'
             refspec: '$GERRIT_REFSPEC'
             branch: '{branch}'
         - integration-distribution-scm:
-            credentials-id: '{ssh-credentials}'
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -436,23 +433,26 @@
                 notbuilt: false
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: '{sxp-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'sxp-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{sxp-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'sxp-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         ignore-upstream-changes: true
         post-step-run-condition: 'SUCCESS'
 
@@ -460,12 +460,19 @@
         - integration-distribution-check
 
     publishers:
-        - archive:
-            artifacts: 'karaf.log'
-        - archive:
-            artifacts: 'karaf_console.log'
         - email-notification:
             email-prefix: '[sxp]'
+        - postbuildscript:
+            builders:
+                - shell: |
+                    #!/bin/bash
+                    mkdir -p $WORKSPACE/archives
+                    cp karaf*.log $WORKSPACE/archives
+            script-only-if-succeeded: False
+            script-only-if-failed: False
+            mark-unstable-if-failed: True
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-integration-{stream}'
@@ -497,15 +504,12 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:
@@ -513,19 +517,20 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: '{sxp-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'sxp-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -534,6 +539,8 @@
         - email-notification:
             email-prefix: '[sxp] [odlparent] [controller] [yangtools]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-sonar'
@@ -555,15 +562,12 @@
 
     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 * * 6'
@@ -571,19 +575,20 @@
             name: 'sxp'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         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: '{sxp-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'sxp-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -595,6 +600,8 @@
         - email-notification:
             email-prefix: '[sxp]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-clm-{stream}'
@@ -616,32 +623,30 @@
 
     scm:
         - git-scm:
-            credentials-id: '{ssh-credentials}'
             refspec: ''
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{sxp-settings}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'sxp-settings'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
-        settings: '{sxp-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'sxp-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     postbuilders:
         - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
@@ -651,6 +656,8 @@
     publishers:
         - email-notification:
             email-prefix: '[sxp]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'sxp-validate-autorelease-{stream}'
@@ -686,7 +693,7 @@
     scm:
         - git:
             url: '$CLONE_URL'
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             refspec: ''
             branches:
                 - 'origin/{branch}'
@@ -696,10 +703,8 @@
                 timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -727,7 +732,6 @@
                       pattern: '**/*.xml'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
@@ -737,16 +741,20 @@
             goals: 'clean install -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
             - '-Xmx8g'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'clean validate -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
+        settings: 'autorelease-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         automatic-archiving: false
         post-step-run-condition: UNSTABLE
 
@@ -756,4 +764,6 @@
     publishers:
         - email-notification:
             email-prefix: '[autorelease] [sxp]'
+        - archive-build:
+            maven-version: '{mvn33}'