Merge "Revert "Add refspec to validate-autorelease job""

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1f5ab471086f997616652132370e7bd14edb106d..cb837401cf46b95277e05ddb520898749738b346 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -23,7 +23,10 @@
           name: ARCHIVE_ARTIFACTS
           default: >
               {artifacts}
-              **/target/surefire-reports/*-output.txt
+              **/target/surefire-reports/*.txt
+              **/target/surefire-reports/*.xml
+              **/target/failsafe-reports/*.txt
+              **/target/failsafe-reports/*.xml
               **/hs_err_*.log
               **/target/feature/feature.xml
               **/*.hprof
@@ -302,6 +305,20 @@
                 healthy: 50
                 unhealthy: 40
 
+- builder:
+    # Deploys a maven site to Nexus using lftools nexus-zip command
+    name: opendaylight-infra-deploy-maven-site
+    builders:
+      - lf-provide-maven-settings:
+          global-settings-file: global-settings
+          settings-file: '{settings-file}'
+      - lf-infra-create-netrc:
+          server-id: opendaylight-site
+      - shell: !include-raw-escape:
+          - global-jjb/shell/lftools-install.sh
+          - opendaylight-infra-deploy-maven-site.sh
+      - lf-provide-maven-settings-cleanup
+
 - builder:
     name: opendaylight-infra-stack
     # opendaylight-infra-stack.sh has a required variable {stack-template} that
@@ -460,6 +477,9 @@
             - 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/*"
@@ -476,10 +496,6 @@
                   fi
               done
           done
-          for p in $provision; do
-              /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
-          done
-
 
 - builder:
     name: packer-build
@@ -489,12 +505,18 @@
             - 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
@@ -544,7 +566,7 @@
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder:
@@ -583,7 +605,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: 'integration-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
 
 - builder: