X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Freleng-macros.yml;h=c2cff32615f2c65535edf1faa567d83fd4a7c1de;hb=36b4348e88e2dc2f8a53fa3b9d053aa0bd25abb9;hp=28216388e6073dbad11c9d9758d27766bc623335;hpb=0f548e950248e1c35c7dcd8e922834b3228a79e4;p=releng.git

diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 28216388e..c2cff3261 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -76,6 +76,16 @@
           submodule:
             recursive: true
             timeout: 20
+
+- scm:
+    name: git-scm-openstack
+    scm:
+      - git: &git-scm-openstack-defaults
+          url: '$GIT_BASE'
+          branches:
+            - 'origin/$BRANCH'
+          timeout: 15
+
 - trigger:
     name: 'daily-trigger-disabled'
     triggers:
@@ -421,6 +431,12 @@
       - shell: |
           find $WORKSPACE -type f -name '*.log' | xargs rm -f
 
+- builder:
+    name: track-begin-timestamp
+    builders:
+      - shell: |
+          echo "export TIMESTAMP_START="\'`date '+%Y-%m-%d %H:%M:%S.%3N'`\' > $WORKSPACE/installer_track.sh
+
 - publisher:
     name: archive-artifacts
     publishers:
@@ -469,29 +485,27 @@
     name: 'email_ptl_defaults'
     content-type: text
     attach-build-log: true
+    attachments: '*.log'
     compress-log: true
     always: true
     subject: '{subject}'
 
-- publisher:
+- publisher: &email_apex_ptl_defaults
     name: 'email-apex-ptl'
-    publishers: &email_apex_ptl_defaults
+    publishers:
       - email-ext:
           <<: *email_ptl_defaults
           recipients: >
             trozet@redhat.com
 - publisher:
     name: 'email-apex-os-net-config-ptl'
-    publishers:
-      <<: *email_apex_ptl_defaults
+    <<: *email_apex_ptl_defaults
 - publisher:
     name: 'email-apex-puppet-tripleo-ptl'
-    publishers:
-      <<: *email_apex_ptl_defaults
+    <<: *email_apex_ptl_defaults
 - publisher:
     name: 'email-apex-tripleo-heat-templates-ptl'
-    publishers:
-      <<: *email_apex_ptl_defaults
+    <<: *email_apex_ptl_defaults
 
 - publisher:
     name: 'email-armband-ptl'
@@ -557,17 +571,16 @@
           recipients: >
             stephen.wong1@huawei.com
 
-- publisher:
+- publisher: &email_compass4nfv_ptl_defaults
     name: 'email-compass4nfv-ptl'
-    publishers: &email_compass4nfv_ptl_defaults
+    publishers:
       - email-ext:
           <<: *email_ptl_defaults
           recipients: >
             chigang@huawei.com
 - publisher:
     name: 'email-compass-containers-ptl'
-    publishers:
-      <<: *email_compass4nfv_ptl_defaults
+    <<: *email_compass4nfv_ptl_defaults
 
 - publisher:
     name: 'email-conductor-ptl'
@@ -833,17 +846,16 @@
           recipients: >
             shang.xiaodong@zte.com.cn
 
-- publisher:
+- publisher: &email_pharos_ptl_defaults
     name: 'email-pharos-ptl'
-    publishers: &email_pharos_ptl_defaults
+    publishers:
       - email-ext:
           <<: *email_ptl_defaults
           recipients: >
             jack.morgan@intel.com
 - publisher:
     name: 'email-pharos-tools-ptl'
-    publishers:
-      <<: *email_pharos_ptl_defaults
+    <<: *email_pharos_ptl_defaults
 
 - publisher:
     name: 'email-promise-ptl'
@@ -861,29 +873,30 @@
           recipients: >
             wu.zhihui1@zte.com.cn
 
-- publisher:
+- publisher: &email_releng_ptl_defaults
     name: 'email-releng-ptl'
-    publishers: &email_releng_ptl_defaults
+    publishers:
       - email-ext:
           <<: *email_ptl_defaults
           recipients: >
             fatih.degirmenci@ericsson.com
 - publisher:
     name: 'email-releng-anteater-ptl'
-    publishers:
-      <<: *email_releng_ptl_defaults
+    <<: *email_releng_ptl_defaults
 - publisher:
     name: 'email-releng-testresults-ptl'
     publishers:
-      <<: *email_releng_ptl_defaults
+      - email-ext:
+          <<: *email_ptl_defaults
+          recipients: >
+            fatih.degirmenci@ericsson.com
+            feng.xiaowei@zte.com.cn
 - publisher:
     name: 'email-releng-utils-ptl'
-    publishers:
-      <<: *email_releng_ptl_defaults
+    <<: *email_releng_ptl_defaults
 - publisher:
     name: 'email-releng-xci-ptl'
-    publishers:
-      <<: *email_releng_ptl_defaults
+    <<: *email_releng_ptl_defaults
 
 - publisher:
     name: 'email-samplevnf-ptl'
@@ -964,3 +977,23 @@
           <<: *email_ptl_defaults
           recipients: >
             ross.b.brattain@intel.com
+
+- publisher:
+    name: 'report-provision-result'
+    publishers:
+      - postbuildscript:
+          script-only-if-succeeded: true
+          builders:
+            - shell: |
+                echo "export PROVISION_RESULT=SUCCEED" >> $WORKSPACE/installer_track.sh
+                echo "export INSTALLER={installer}" >> $WORKSPACE/installer_track.sh
+            - shell:
+                !include-raw-escape: installer-report.sh
+      - postbuildscript:
+          script-only-if-failed: true
+          builders:
+            - shell: |
+                echo "export PROVISION_RESULT=FAIL" >> $WORKSPACE/installer_track.sh
+                echo "export INSTALLER={installer}" >> $WORKSPACE/installer_track.sh
+            - shell:
+                !include-raw-escape: installer-report.sh