X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=ca11a7c861b88873ca974ce55ed29b55050e3072;hb=57368a56c8a5a3597c5790752cc50196705434e2;hp=38f4e5651cab78153f649a7454f66520178fd945;hpb=4b876de6899d3a6d5d84a1d726a3020d8f0c497c;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 38f4e5651..ca11a7c86 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -15,7 +15,7 @@
             description: 'Parameter to identify an ODL Gerrit project'
         - string:
             name: ARCHIVE_ARTIFACTS
-            default: '{artifacts} **/target/surefire-reports/*-output.txt'
+            default: '{artifacts} **/target/surefire-reports/*-output.txt **/hs_err_*.log **/target/feature/feature.xml'
             description: 'Space separated glob patterns for artifacts to archive into logs.opendaylight.org'
         - string:
             name: GERRIT_PROJECT
@@ -243,7 +243,14 @@
             body: |
                 $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
 
-                Check console output at $BUILD_URL to view the results.
+                Please refer to the logs server URL for console logs when possible
+                and use the Jenkins Build URL as a last resort.
+
+                Console Logs URL:
+                https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+
+                Jenkins Build URL:
+                $BUILD_URL
             unstable: true
             fixed: true
             send-to:
@@ -280,15 +287,7 @@
     publishers:
         - postbuildscript:
             builders:
-                - shell: |
-                    #!/bin/bash
-                    if [ -d "$WORKSPACE/.venv-openstack" ]; then
-                        source $WORKSPACE/.venv-openstack/bin/activate
-                        OS_STATUS=`openstack --os-cloud rackspace stack show -f json -c stack_status $STACK_NAME | jq -r '.stack_status'`
-                        if [ "$OS_STATUS" != "CREATE_IN_PROGRESS" ] && [ "$OS_STATUS" != "DELETE_IN_PROGRESS" ]; then
-                            openstack --os-cloud rackspace stack delete --yes $STACK_NAME
-                        fi
-                    fi
+                - shell: !include-raw: include-raw-stack-delete.sh
                 - shell: !include-raw: include-raw-deploy-archives.sh
                 - maven-target:
                         maven-version: '{maven-version}'
@@ -476,9 +475,14 @@
                 /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1
             done
 
+
 - builder:
     name: packer-build
     builders:
+        - config-file-provider:
+            files:
+                - file-id: 'packer-cloud-env'
+                  variable: 'CLOUDENV'
         - shell: |
             cd packer
             export PACKER_LOG="yes" && \
@@ -494,3 +498,11 @@
     name: verify-gpg-signature
     builders:
         - shell: !include-raw: include-raw-verify-gpg-signatures.sh
+
+- builder:
+    name: opendaylight-infra-jjbini
+    builders:
+    - config-file-provider:
+          files:
+            - file-id: 'jjbini'
+              target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'