X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=d56eb57c51dfb14ed27507453be92e8e261a7571;hb=d211845538c97d10a32e0cf214d679222d3c20d9;hp=4f6cf13761cfeaf258f9813b2fc30b9c4fb30600;hpb=c9f6bddf05832170264b79288a3e91451e025d9e;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 4f6cf1376..d56eb57c5 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -16,6 +16,46 @@
             default: '{branch}'
             description: "JJB configured GERRIT_BRANCH parameter"
 
+- parameter:
+    name: gerrit-project-parameter
+    parameters:
+        - string:
+            name: GERRIT_PROJECT
+            default: '{project}'
+            description: "GERRIT_PROJECT parameter if not given by trigger"
+
+- parameter:
+    name: gerrit-refspec-parameter
+    parameters:
+        - string:
+            name: GERRIT_REFSPEC
+            default: '{refspec}'
+            description: "GERRIT_REFSPEC parameter if not given by trigger"
+
+- parameter:
+    name: controller-version-parameter
+    parameters:
+        - string:
+            name: ODL_VERSION
+            default: '{odl_version}'
+            description: 'Controller version (for use with openstacks networking_odl project)'
+
+- parameter:
+    name: patches-to-build-parameter
+    parameters:
+        - string:
+            name: PATCHES_TO_BUILD
+            default: ''
+            description: 'csv list of patches in project:changeset format to build distribution with'
+
+- parameter:
+    name: distribution-branch-to-build-parameter
+    parameters:
+        - string:
+            name: DISTRIBUTION_BRANCH_TO_BUILD
+            default: 'master'
+            description: 'distribution repo branch to build with'
+
 - scm:
     name: git-scm
     scm:
@@ -100,6 +140,27 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/master'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
+
+- trigger:
+    name: gerrit-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}'
 
 - publisher:
     name: archive-artifacts
@@ -153,17 +214,26 @@
 - builder:
     name: jacoco-nojava-workaround
     builders:
-        - shell: 'mkdir -p $WORKSPACE/target/classes'
+        - shell: 'mkdir -p $WORKSPACE/target/classes $WORKSPACE/jacoco/classes'
 
 - builder:
     name: check-clm
     builders:
         - sonatype-clm:
             application-name: '{application-name}'
-            scan-targets: '**/target/**'
 
 - builder:
     name: releng-check-unicode
     builders:
         - shell: |
             $WORKSPACE/scripts/check-unicode.sh jjb/
+
+- builder:
+    name: provide-maven-settings
+    builders:
+    - config-file-provider:
+        files:
+        - file-id: '{global-settings-file}'
+          variable: 'GLOBAL_SETTINGS_FILE'
+        - file-id: '{settings-file}'
+          variable: 'SETTINGS_FILE'