X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller.yaml;h=a4c75bcdab69319f296274f70b948e6dbbb293bb;hb=6a29e601b8c98637b42071e6f7c61d88c9faf6d2;hp=7c78970c14a71945a2a4e0c90114472a4bc1226a;hpb=970debd523b28420ba0a7d9b396cf2489fc079ce;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 7c78970c1..a4c75bcda 100644
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -43,13 +43,6 @@
                 - openjdk8
             disable_autorelease: True
             disable_distribution_check: True
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
-            disable_distribution_check: True
 
     project: 'controller'
 
@@ -131,6 +124,8 @@
             global-settings: '{odl-global-settings}'
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - findbugs
         - email-notification:
             email-prefix: '[controller]'
@@ -380,6 +375,7 @@
 
     project-type: maven
     node: dynamic_verify
+    concurrent: true
     jdk: '{jdk}'
 
     logrotate:
@@ -424,6 +420,10 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'test-distribution'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -431,15 +431,12 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
             skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+                successful: false
+                failed: false
+                unstable: false
+                notbuilt: false
 
     prebuilders:
-        - integration-get-bundle-url
-        - inject:
-            properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
         - maven-target:
             maven-version: '{mvn33}'
@@ -461,13 +458,13 @@
         post-step-run-condition: 'SUCCESS'
 
     postbuilders:
-        - trigger-builds:
-            - project: 'integration-distribution-deploy-{stream}'
-              block: true
-              predefined-parameters:
-                  BUNDLEURL=$BUNDLEURL
+        - integration-distribution-check
 
     publishers:
+        - archive:
+            artifacts: 'karaf.log'
+        - archive:
+            artifacts: 'karaf_console.log'
         - email-notification:
             email-prefix: '[controller]'
 
@@ -570,7 +567,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
             name: 'controller'
 
@@ -631,7 +628,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -682,16 +679,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
@@ -720,12 +722,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}'
@@ -747,12 +751,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] [controller]'