X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Finfra%2Fbifrost-verify-jobs.yml;h=5f25ff88356cea17ca3e66c8622347b8cf2a4638;hb=5ceb25f8957cd5b7919a1ccdbf37970e37316cd4;hp=be3cf9a0e71f8561493d02f1efc39cf46c40ef97;hpb=27cda9f025a173b4f0f9e90a4aae9774f7f70026;p=releng.git

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index be3cf9a0e..5f25ff883 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -36,8 +36,7 @@
             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'
@@ -121,6 +120,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:
@@ -133,15 +135,10 @@
             timeout: 10
             wipe-workspace: true
 
-    triggers:
-        - '{project}-gerrit-trigger':
-            branch: '{branch}'
-
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - shell:
-            !include-raw-escape: ./bifrost-verify.sh
+        - bifrost-set-name
+        - bifrost-build
+        - bifrost-artifacts-upload
 
     publishers:
         - email:
@@ -162,7 +159,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'
             silent-start: true
             projects:
               - project-compare-type: 'PLAIN'
@@ -191,6 +188,7 @@
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
+            custom-url: '* $JOB_NAME $BIFROST_LOG_URL'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng'
@@ -203,3 +201,24 @@
                   - 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
+
+- builder:
+    name: bifrost-artifacts-upload
+    builders:
+        - shell:
+            !include-raw: ./bifrost-upload-logs.sh