X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfra%2Fbifrost-verify-jobs.yml;h=4c106fc5c8a5d8c596555bc582df3a2f7f7b6169;hb=3a3480bc639508560cdb8cbdfc3fd897d5e79781;hp=be3cf9a0e71f8561493d02f1efc39cf46c40ef97;hpb=fe4a95511d13af9436df4f61410db0077960955e;p=releng.git

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index be3cf9a0e..4c106fc5c 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -36,12 +36,8 @@
             disabled: false
             dib-os-release: '42.2'
             dib-os-element: 'opensuse-minimal'
-            # python-xml is needed until https://review.openstack.org/#/c/400150/ is merged
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl,python-xml'
+            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
 #--------------------------------
@@ -58,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
@@ -75,6 +71,7 @@
     concurrent: false
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -121,6 +118,9 @@
         - label:
             name: SLAVE_LABEL
             default: 'infra-{type}-{distro}'
+        - string:
+            name: BIFROST_LOG_URL
+            default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
 
     scm:
         - git:
@@ -138,10 +138,8 @@
             branch: '{branch}'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - shell:
-            !include-raw-escape: ./bifrost-verify.sh
+        - bifrost-set-name
+        - bifrost-build
 
     publishers:
         - email:
@@ -162,7 +160,7 @@
                     exclude-no-code-change: 'false'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
-            custom-url: '* $JOB_NAME $BUILD_URL'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
             silent-start: true
             projects:
               - project-compare-type: 'PLAIN'
@@ -191,6 +189,7 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng'
@@ -200,6 +199,19 @@
                 file-paths:
                   - compare-type: ANT
                     pattern: 'prototypes/bifrost/**'
-                  - compare-type: ANT
-                    pattern: 'jjb/infra/**'
             readable-message: true
+
+#---------------------------
+# builder macros
+#---------------------------
+- builder:
+    name: bifrost-set-name
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+
+- builder:
+    name: bifrost-build
+    builders:
+        - shell:
+            !include-raw: ./bifrost-verify.sh