X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-macros.yaml;h=bb9bf2700dfb14fbdc788784c5d5a3cfc5610f36;hb=e28c08375343da89f009d702ab2df2f901e03086;hp=0dc4337d4efa862556c2e20fbf76c263ba41bf72;hpb=c8b29ee8acaf1306d9c05cd8422a6997fbeefec2;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 0dc4337d4..bb9bf2700 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -5,7 +5,7 @@
         - string:
             name: RELEASE_TAG
             default: '{release-tag}'
-            description: "The Release train tag to use eg. Helium-SR3"
+            description: "The Release train tag to use eg. Beryllium-SR1"
 
 - parameter:
     name: autorelease-release-branch
@@ -13,38 +13,89 @@
         - string:
             name: RELEASE_BRANCH
             default: '{release-branch}'
-            description: "The Release train branch to base build off eg. stable/helium"
-
-- parameter:
-    name: autorelease-release-datestamp
-    parameters:
-        - bool:
-            name: DATESTAMP
-            default: '{datestamp}'
-            description: "Whether to include a datestamp or not"
+            description: "The Release train branch to base build off eg. stable/beryllium"
 
 - wrapper:
     name: autorelease-build-timeout
     wrappers:
         - timeout:
             type: absolute
-            timeout: 480
+            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
@@ -56,7 +107,9 @@
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m'
             settings: '{settings}'
+            settings-type: cfp
             global-settings: '{global-settings}'
+            global-settings-type: cfp
 
 - builder:
     name: autorelease-maven-sources-post-process
@@ -68,10 +121,43 @@
     name: autorelease-generate-taglist
     builders:
         - shell: |
-            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} >> ../taglist'
+            echo autorelease `git rev-parse --verify HEAD` ${RELEASE_TAG} | tee -a $WORKSPACE/taglist.log
+            git submodule foreach 'echo $path `git rev-parse --verify HEAD` ${RELEASE_TAG} | tee -a $WORKSPACE/taglist.log'
+
+- builder:
+    name: autorelease-distribute-taglist
+    builders:
+        - shell: |
+            if [ -d "integration/distribution/distributions" ]; then
+                cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distributions/karaf/src/main/assembly/"
+            else
+                cp -vf "$WORKSPACE/taglist.log" "integration/distribution/distribution-karaf/src/main/assembly/"
+            fi
 
 - 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