Merge "jjb: infra: bifrost-verity: Ignore missing landing page"

[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 cbe21e2..4c106fc 100644 (file)
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -38,9 +38,6 @@
             dib-os-element: 'opensuse-minimal'
             dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
-            vm-disk: '30'
-            vm-memory: '4096'
-            vm-cpu: '2'
 #--------------------------------
 # type
 #--------------------------------
@@ -57,9 +54,9 @@
 #--------------------------------
 - defaults:
     name: vm_defaults
-    vm-disk: '100'
-    vm-memory: '8192'
-    vm-cpu: '4'
+    vm-disk: '30'
+    vm-memory: '4096'
+    vm-cpu: '2'
 
 #--------------------------------
 # job templates
@@ -74,6 +71,7 @@
     concurrent: false
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -142,7 +140,6 @@
     builders:
         - bifrost-set-name
         - bifrost-build
-        - bifrost-artifacts-upload
 
     publishers:
         - email:
@@ -163,7 +160,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'
@@ -192,7 +189,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'
@@ -202,8 +199,6 @@
                 file-paths:
                   - compare-type: ANT
                     pattern: 'prototypes/bifrost/**'
-                  - compare-type: ANT
-                    pattern: 'jjb/infra/**'
             readable-message: true
 
 #---------------------------
@@ -220,9 +215,3 @@
     builders:
         - shell:
             !include-raw: ./bifrost-verify.sh
-
-- builder:
-    name: bifrost-artifacts-upload
-    builders:
-        - shell:
-            !include-raw: ./bifrost-upload-logs.sh