X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-macros.yaml;h=e9e33f728e2c61d9e0a65b4768c4e85050d3fc7a;hb=b786d1bba1856d0f75b6e3f7df63a89ae0b7d342;hp=bd2c379f8dad598ed97890182ee23c817d4ce2b7;hpb=534c99d382255dfd21e9d52da394ba474cc1e232;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index bd2c379f8..e9e33f728 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -28,23 +28,82 @@
     wrappers:
         - timeout:
             type: absolute
-            timeout: 720
+            timeout: 1440
             fail: true
 
+- trigger:
+    name: autorelease-trigger-patch-site-merged
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'republish'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{name}'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: src/site/**
+                    - compare-type: ANT
+                      pattern: site.xml
+
+- trigger:
+    name: autorelease-trigger-patch-site-submitted
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{name}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: src/site/**
+                    - compare-type: ANT
+                      pattern: site.xml
+
+- builder:
+    name: autorelease-checkout-gerrit-patch
+    builders:
+        - shell: |
+            cd ${GERRIT_PROJECT}
+            echo "Checking out ${GERRIT_PROJECT} patch ${GERRIT_REFSPEC}..."
+            git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
+            cd ..
+
 - builder:
     name: autorelease-cfp
     builders:
         - config-file-provider:
             files:
                 - file-id: '{autorelease-settings}'
-                  variable: 'AUTORELEASE_SETTINGS'
+                  variable: 'SETTINGS_FILE'
                 - file-id: '{odl-global-settings}'
-                  variable: 'ODL_GLOBAL_SETTINGS'
+                  variable: 'GLOBAL_SETTINGS_FILE'
 
 - builder:
     name: autorelease-maven-deploy
     builders:
-        - shell: !include-raw include-raw-autorelease-maven-deploy.sh
+        - shell:
+            !include-raw:
+                - include-raw-autorelease-maven-deploy.sh
 
 - builder:
     name: autorelease-maven-sources
@@ -68,10 +127,32 @@
     name: autorelease-generate-taglist
     builders:
         - shell: |
-            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} >> ../taglist'
+            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} >> ../taglist.log'
 
 - builder:
     name: autorelease-generate-release-patches
     builders:
-        - shell:
-            !include-raw-escape include-raw-autorelease-release-versions.sh
+    - shell:
+        !include-raw:
+            - include-raw-autorelease-release-versions.sh
+
+- builder:
+    name: autorelease-sys-stats
+    builders:
+        - shell: |
+            uname -a
+            df -h
+
+- builder:
+    name: autorelease-get-integration-test-variables
+    builders:
+    - shell:
+        !include-raw:
+            - include-raw-autorelease-get-integration-test-variables.sh
+
+- builder:
+    name: autorelease-generate-project-report
+    builders:
+    - shell:
+        !include-raw:
+            - include-raw-generate-project-report.sh