Merge "fixing docs to make the YAML valid"

[releng/builder.git] / jjb / vtn / vtn.yaml

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 675aa58ce8350dac54a3b865313eb32643ea9311..70b05aefa9b558e7d0e1eca349ae108e030ef2b9 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.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,7 +102,6 @@
             branch: '{branch}'
 
     builders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
@@ -131,6 +124,8 @@
         - email-notification:
             email-prefix: '[vtn]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'vtn-merge-{stream}'
@@ -164,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'
@@ -181,7 +173,6 @@
             branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
@@ -245,6 +236,8 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'vtn-periodic-{stream}'
@@ -275,21 +268,17 @@
 
     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'
@@ -312,6 +301,8 @@
         - email-notification:
             email-prefix: '[vtn]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'vtn-distribution-{stream}'
@@ -336,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:
@@ -352,7 +340,6 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: 'vtn-settings'
@@ -374,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
@@ -406,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:
@@ -448,7 +433,6 @@
                 notbuilt: false
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
@@ -476,12 +460,19 @@
         - integration-distribution-check
 
     publishers:
-        - archive:
-            artifacts: 'karaf.log'
-        - archive:
-            artifacts: 'karaf_console.log'
         - email-notification:
             email-prefix: '[vtn]'
+        - 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: 'vtn-integration-{stream}'
@@ -513,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:
@@ -529,7 +517,6 @@
             result: 'success'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
@@ -552,6 +539,8 @@
         - email-notification:
             email-prefix: '[vtn] [controller] [mdsal] [neutron] [odlparent] [openflowplugin] [ovsdb] [yangtools]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'vtn-sonar'
@@ -573,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'
@@ -589,7 +575,6 @@
             name: 'vtn'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
@@ -615,6 +600,8 @@
         - email-notification:
             email-prefix: '[vtn]'
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'vtn-clm-{stream}'
@@ -636,21 +623,17 @@
 
     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: 'vtn-settings'
@@ -673,6 +656,8 @@
     publishers:
         - email-notification:
             email-prefix: '[vtn]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'vtn-validate-autorelease-{stream}'
@@ -708,7 +693,7 @@
     scm:
         - git:
             url: '$CLONE_URL'
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'opendaylight-jenkins-ssh'
             refspec: ''
             branches:
                 - 'origin/{branch}'
@@ -718,10 +703,8 @@
                 timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -749,7 +732,6 @@
                       pattern: '**/*.xml'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
@@ -782,4 +764,6 @@
     publishers:
         - email-notification:
             email-prefix: '[autorelease] [vtn]'
+        - archive-build:
+            maven-version: '{mvn33}'