Merge "[macro] property logrotate"

[releng.git] / jjb / infra / bifrost-verify-jobs.yml

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index 5f25ff8..28e36aa 100644 (file)
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -74,6 +74,7 @@
     concurrent: false
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -135,10 +136,13 @@
             timeout: 10
             wipe-workspace: true
 
+    triggers:
+        - '{project}-gerrit-trigger':
+            branch: '{branch}'
+
     builders:
         - bifrost-set-name
         - bifrost-build
-        - bifrost-artifacts-upload
 
     publishers:
         - email:
@@ -159,7 +163,7 @@
                     exclude-no-code-change: 'false'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
-            custom-url: '* $JOB_NAME $BIFROST_LOG_URL'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
             silent-start: true
             projects:
               - project-compare-type: 'PLAIN'
@@ -188,7 +192,7 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
-            custom-url: '* $JOB_NAME $BIFROST_LOG_URL'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng'
@@ -216,9 +220,3 @@
     builders:
         - shell:
             !include-raw: ./bifrost-verify.sh
-
-- builder:
-    name: bifrost-artifacts-upload
-    builders:
-        - shell:
-            !include-raw: ./bifrost-upload-logs.sh