Merge "Find major version from stream, avoid mismatches"

[releng/builder.git] / jjb / releng-macros.yaml

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 8814727c36d6d557c6e22cdf514cc6369286a93f..1bfd92caa7b2fbd5c126c304278dea691852ff78 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -21,9 +21,9 @@
           description: 'Parameter to identify an ODL Gerrit project'
       - string:
           name: ARCHIVE_ARTIFACTS
+          # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
           default: >
               {artifacts}
-              # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
               **/target/surefire-reports/*-output.txt
               **/target/failsafe-reports/failsafe-summary.xml
               **/hs_err_*.log
@@ -41,7 +41,10 @@
       - string:
           name: GERRIT_REFSPEC
           default: '{refspec}'
-          description: "GERRIT_REFSPEC parameter if not given by trigger"
+          description: |
+              Gerrit reference to checkout (ex: refs/heads/master,
+              refs/changes/48/61548/1 where 61548 is Gerrit change ID, 1 is
+              patch number and 48 is last two digits of change ID)
       - string:
           name: STACK_NAME
           default: '$SILO-$JOB_NAME-$BUILD_NUMBER'
@@ -412,12 +415,12 @@
 - builder:
     name: releng-generate-p2pom
     builders:
-      - shell: !include-raw: include-raw-generate-p2pom.sh
+      - shell: !include-raw: generate-p2pom.sh
 
 - builder:
     name: releng-update-p2composite-metadata
     builders:
-      - shell: !include-raw: include-raw-update-p2composite-metadata.sh
+      - shell: !include-raw: update-p2composite-metadata.sh
       - conditional-step:
           condition-kind: file-exists
           condition-filename: deploy-composite-repo.xml
@@ -433,7 +436,7 @@
 - builder:
     name: releng-stage-release
     builders:
-      - shell: !include-raw: include-raw-stage-release.sh
+      - shell: !include-raw: stage-release.sh
 
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
@@ -465,7 +468,7 @@
     # developers public keys into a local repository without increasing the job thoughput.
     name: verify-gpg-signature
     builders:
-      - shell: !include-raw: include-raw-verify-gpg-signatures.sh
+      - shell: !include-raw: verify-gpg-signatures.sh
 
 - builder:
     name: opendaylight-infra-jjbini
@@ -646,3 +649,13 @@
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+
+- publisher:
+    name: opendaylight-infra-generate-csit-status-report
+    publishers:
+      - postbuildscript:
+          builders:
+            - shell: !include-raw: generate-csit-status-report.sh
+          script-only-if-succeeded: false
+          script-only-if-failed: false
+          mark-unstable-if-failed: false