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 cb837401cf46b95277e05ddb520898749738b346..1bfd92caa7b2fbd5c126c304278dea691852ff78 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -21,12 +21,11 @@
           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}
-              **/target/surefire-reports/*.txt
-              **/target/surefire-reports/*.xml
-              **/target/failsafe-reports/*.txt
-              **/target/failsafe-reports/*.xml
+              **/target/surefire-reports/*-output.txt
+              **/target/failsafe-reports/failsafe-summary.xml
               **/hs_err_*.log
               **/target/feature/feature.xml
               **/*.hprof
@@ -42,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'
@@ -255,15 +257,6 @@
             unstable: true
             notbuilt: true
 
-- publisher:
-    name: archive-artifacts
-    publishers:
-      - archive:
-          artifacts: '{artifacts}'
-          allow-empty: true
-          fingerprint: true
-          latest-only: true
-
 - publisher:
     name: email-notification
     publishers:
@@ -422,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
@@ -443,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
@@ -469,62 +462,13 @@
       - openstack:
           single-use: true
 
-- builder:
-    name: packer-validate
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
-      - shell: |
-          #!/bin/bash
-          # Ensure we fail the job if any steps fail.
-          set -eu -o pipefail
-          cd packer
-          varfiles="../packer/vars/*"
-          templates="../packer/templates/*"
-          provision="../packer/provision/*.sh"
-          for v in $varfiles; do
-              [[ "${v##*/}" =~ ^(cloud-env.*)$ ]] && continue
-              for t in $templates; do
-                  export PACKER_LOG="yes" && \
-                  export PACKER_LOG_PATH="packer-validate-${v##*/}-${t##*/}.log" && \
-                              packer.io validate -var-file=$CLOUDENV \
-                              -var-file=$v $t
-                  if [ $? -ne 0 ]; then
-                      break
-                  fi
-              done
-          done
-
-- builder:
-    name: packer-build
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'packer-cloud-env'
-              variable: 'CLOUDENV'
-      - shell: |
-          #!/bin/bash
-          # Ensure we fail the job if any steps fail.
-          set -eu -o pipefail
-          cd packer
-          export PACKER_LOG="yes" && \
-          export PACKER_LOG_PATH="packer-build.log" && \
-                      packer.io build -color=false -var-file=$CLOUDENV \
-                       -var-file=../packer/vars/{platform}.json \
-                       ../packer/templates/{template}.json
-          # Split public and private cloud logs
-          grep -e 'public_cloud' packer-build.log > packer-build_public_cloud.log  2>&1
-          grep -e 'private_cloud' packer-build.log > packer-build_private_cloud.log 2>&1
-
 - builder:
     # TODO: Verify signature after downloading users public key from a locally created
     # repository instead of the public keymesh. This requires a process in place to get ODL
     # 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
@@ -700,7 +644,18 @@
               clean install dependency:tree
               -DoutputFile=dependency_tree.txt -s fake_remotes.xml
               -Pq
+              -Dsft.heap.max=4g
               -DskipTests=false
               {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