Merge "Add macro for providing log location in Gerrit"

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index af725dabc9dc26a3f15beee5dfe007ff09c41739..a350fd9ab42f73d80a79c50bf705073a9a4ccb13 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -58,11 +58,11 @@
                       pattern: jjb-templates/**
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
             jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
-
         - releng-check-unicode
 
     publishers:
@@ -122,6 +122,7 @@
 
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             virtualenv $WORKSPACE/venv
             source $WORKSPACE/venv/bin/activate
@@ -188,6 +189,7 @@
                       pattern: jjb-templates/**
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             pip freeze
             jenkins-jobs --version
@@ -236,6 +238,7 @@
         - timed: 'H H * * 0'
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell: |
             jenkins-jobs --flush-cache update --recursive jjb/
 
@@ -272,6 +275,7 @@
         - timed: 'H H * * 1'
 
     builders:
+        - opendaylight-infra-pre-builders
         - shell:
             !include-raw-escape:
                 - include-raw-check-poms.sh

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7bd3a04e76657cd10a139ec01720637f42c1c265..e8c072b29e79ac24fefa99b2f16a0ffe28c7cbb2 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -290,6 +290,19 @@
         - workspace-cleanup:
             fail-build: false
 
+- builder:
+    name: opendaylight-infra-pre-builders
+    builders:
+        - shell: |
+            if [ ! -z "$GERRIT_PATCHSET_REVISION" ]; then
+                LOG_MESSAGE="
+                    Logs for $JOB_NAME:
+                    https://logs.opendaylight.org/$SILO/$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER
+                    (note that logs will be unavailable until the job is completed running.)
+                "
+                ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit review -m \"${LOG_MESSAGE}\" $GERRIT_PATCHSET_REVISION
+            fi
+
 - builder:
     name: wipe-org-opendaylight-repo
     builders: