Update automated project templates

[releng/builder.git] / jjb / integration / distribution / distribution.yaml

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 4016e53b396f9964c67202b4bcb9ee6bff062351..e1df5813581435011fa88eb78e80aa68ea692103 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -14,13 +14,21 @@
     # 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: openjdk8
             jdks:
                 - openjdk8
                 - openjdk7
             disable_autorelease: False
+            disable_distribution_check: False
 
     project: 'integration/distribution'
 
@@ -32,10 +40,11 @@
 
 - job-template:
     name: 'distribution-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -60,7 +69,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
             name: 'integration/distribution'
 
@@ -92,6 +101,7 @@
 
 - job-template:
     name: 'distribution-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -120,7 +130,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -171,16 +181,21 @@
             release-branch: '{branch}'
         - autorelease-release-datestamp:
             datestamp: true
+        - string:
+            name: CLONE_URL
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
+            description: "Autorelease clone URL"
 
     scm:
         - git:
-            url: 'https://git.opendaylight.org/gerrit/releng/autorelease'
+            url: '$CLONE_URL'
             refspec: ''
             branches:
                 - 'origin/{branch}'
             skip-tag: true
             submodule:
                 recursive: true
+                timeout: 15
 
     wrappers:
         - autorelease-build-timeout
@@ -209,12 +224,14 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: '**/*.xml'
 
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
-        - autorelease-generate-taglist
         - autorelease-generate-release-patches
         - maven-target:
             maven-version: '{mvn33}'
@@ -236,12 +253,9 @@
         post-step-run-condition: UNSTABLE
 
     postbuilders:
-        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-sys-stats
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log'
         - email-notification:
             email-prefix: '[autorelease] [distribution]'