X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp.yaml;h=998631bebe703d1b98958db575fac1b01a8a899e;hb=4934e4b08bc0892b6a0447709f640b204eaec48c;hp=50d22e6a6152e449bc74ae2a34556fd22bed76f1;hpb=46a6e3714a42994591c5287e2240d823f7f9d039;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 50d22e6a6..998631beb 100644
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -42,13 +42,6 @@
                 - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-            disable_autorelease: True
-            disable_distribution_check: True
 
     project: 'sxp'
 
@@ -130,6 +123,8 @@
             global-settings: '{odl-global-settings}'
 
     publishers:
+        - archive-artifacts:
+            artifacts: '**/target/surefire-reports/*-output.txt, '
         - findbugs
         - email-notification:
             email-prefix: '[sxp]'
@@ -424,6 +419,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 +430,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 +457,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: '[sxp]'
 
@@ -570,7 +566,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
             name: 'sxp'
 
@@ -631,7 +627,7 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - timed: '@weekly'
+        - timed: 'H H * * 6'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -685,11 +681,12 @@
 
     scm:
         - git:
-            url: 'https://git.opendaylight.org/gerrit/releng/autorelease'
+            url: '$GIT_BASE'
             refspec: ''
             branches:
                 - 'origin/{branch}'
             skip-tag: true
+            shallow-clone: true
             submodule:
                 recursive: true
 
@@ -720,12 +717,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 +746,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] [sxp]'