X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=90e755d15d8e870625917ae2cd5645e08cc557d6;hb=0d42fdc8c194681cc42687c09bf74055b209b8c9;hp=8c8ad088467c5593c206c062ab722352fe1aa0b2;hpb=fc7319c7d8e117db61f5b304d16ec1c5b4c4d879;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 8c8ad0884..90e755d15 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -140,6 +140,28 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
 
+- trigger:
+    name: gerrit-trigger-relevant-patch-submitted
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - 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}'
+
 - trigger:
     name: gerrit-trigger-patch-merged
     triggers:
@@ -236,11 +258,42 @@
                       healthy: 50
                       unhealthy: 40
 
+- publisher:
+    name: archive-build
+    # To archive things the job will need to create a "archives" directory in
+    # the workspace and this macro will handle copying the contents of the
+    # archives directory.
+    # Also ensure that the workspace is cleaned up at the end of the build.
+    publishers:
+        - postbuildscript:
+            builders:
+                - shell: !include-raw: include-raw-deploy-archives.sh
+                - maven-target:
+                        maven-version: '{maven-version}'
+                        pom: '.archives/deploy-archives.xml'
+                        goals: 'clean deploy -V -B -q -Dmaven.repo.local=/tmp/r'
+                        settings: 'jenkins-log-archives-settings'
+                        settings-type: cfp
+                        global-settings: 'odl-global-settings'
+                        global-settings-type: cfp
+                - description-setter:
+                    regexp: '^Build logs: .*'
+            script-only-if-succeeded: False
+            script-only-if-failed: False
+            mark-unstable-if-failed: True
+        - workspace-cleanup:
+            fail-build: false
+
 - builder:
     name: wipe-org-opendaylight-repo
     builders:
         - shell: 'if [ -d /tmp/r/org/opendaylight ]; then rm -rf /tmp/r/org/opendaylight; fi'
 
+- builder:
+    name: wipe-local-maven-repo
+    builders:
+        - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi'
+
 - builder:
     name: jacoco-nojava-workaround
     builders:
@@ -268,6 +321,25 @@
         - file-id: '{settings-file}'
           variable: 'SETTINGS_FILE'
 
+- builder:
+    name: releng-fetch-p2zip-if-necessary
+    builders:
+    - shell: |
+        # Cleanup any existing zips and metadata before we download the new update site
+        rm -f *.zip *.xml
+    - conditional-step:
+        condition-kind: strings-match
+        condition-string1: '$P2ZIP_URL'
+        condition-string2: ''
+        condition-basedir: workspace
+        steps:
+            # TODO: Figure out latest snapshot version number to pull rather than hardcoding 1.1.1-SNAPSHOT
+            - maven-target:
+                maven-version: '{maven-version}'
+                goals: 'org.apache.maven.plugins:maven-dependency-plugin:get org.apache.maven.plugins:maven-dependency-plugin:copy -V -B -Dartifact=org.opendaylight.yangide:org.opendaylight.yangide.update-site:1.1.1-SNAPSHOT:zip -DoutputDirectory=$WORKSPACE'
+                settings: '{settings}'
+                global-settings: '{global-settings}'
+
 - builder:
     name: releng-generate-p2pom
     builders:
@@ -277,12 +349,17 @@
     name: releng-update-p2composite-metadata
     builders:
     - shell: !include-raw: include-raw-update-p2composite-metadata.sh
-    - maven-target:
-        maven-version: '{maven-version}'
-        pom: 'deploy-composite-repo.xml'
-        goals: 'clean deploy -V -Dmaven.repo.local=/tmp/r'
-        settings: '{settings}'
-        global-settings: '{global-settings}'
+    - conditional-step:
+        condition-kind: file-exists
+        condition-filename: deploy-composite-repo.xml
+        condition-basedir: workspace
+        steps:
+            - maven-target:
+                maven-version: '{maven-version}'
+                pom: 'deploy-composite-repo.xml'
+                goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
+                settings: '{settings}'
+                global-settings: '{global-settings}'
 
 - builder:
     name: releng-stage-release