X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=390973a5b5ff9b32265eb05dfd69f70cfbe99b87;hb=97f61dca3c17849464c7c3c4e646faa3cafd8012;hp=c9a31fd01447f5a31263530aae6b05ababe54b48;hpb=6cefa01d7bd2a44559006080c568a59d5b5f5cac;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c9a31fd01..390973a5b 100644
--- 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
@@ -76,8 +79,8 @@
       - string:
           name: PATCHES_TO_BUILD
           default: ''
-          # yamllint disable-line rule:line-length
-          description: 'Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)'
+          description: |
+            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
 
 - parameter:
     name: run-test-parameter
@@ -302,43 +305,19 @@
                 healthy: 50
                 unhealthy: 40
 
-- publisher:
-    name: opendaylight-infra-shiplogs
-    # 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.
-    #
-    # Uses the build parameter ARCHIVE_ARTIFACTS if not empty to find files
-    # to archive. You can pass globstar patterns for example "**/*.xml **/*.log"
-    # as the archive pattern. This is a space separated list of files to archive.
-    #
-    # Also ensure that the workspace is cleaned up at the end of the build.
-    publishers:
-      - postbuildscript:
-          builders:
-            - shell: !include-raw: include-raw-stack-delete.sh
-            - shell: !include-raw-escape: 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: .*'
-            # Cleanup after ourselves
-            - wipe-org-opendaylight-repo
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - workspace-cleanup:
-          exclude:
-            # Do not clean up *.jenkins-trigger files for jobs that use a
-            # properties file as input for triggering another build.
-            - '**/*.jenkins-trigger'
-          fail-build: false
+- 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
@@ -370,7 +349,14 @@
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
     builders:
-      - shell: 'echo "$BUILD_URL" > {path}/build.url'
+      - shell: |
+          #!/bin/bash
+          set +e  # DO NOT fail script if command returns non-zero.
+
+          echo "$BUILD_URL" > {path}/build.url
+
+          # DO NOT fail the build if the echo failed.
+          exit 0
 
 - builder:
     name: wipe-org-opendaylight-repo
@@ -491,6 +477,7 @@
             - file-id: 'packer-cloud-env'
               variable: 'CLOUDENV'
       - shell: |
+          #!/bin/bash
           cd packer
           varfiles="../packer/vars/*"
           templates="../packer/templates/*"
@@ -507,10 +494,6 @@
                   fi
               done
           done
-          for p in $provision; do
-              /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
-          done
-
 
 - builder:
     name: packer-build
@@ -520,13 +503,16 @@
             - file-id: 'packer-cloud-env'
               variable: 'CLOUDENV'
       - shell: |
+          #!/bin/bash
           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 \
-                       -parallel=false \
                        ../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
@@ -576,7 +562,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:
@@ -615,7 +601,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: