From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 4 Jul 2017 17:04:43 +0000 (-0400)
Subject: Make autorelease run validation on patch submit
X-Git-Tag: release/nitrogen~312^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=722da1b2727ae8b4b44001735ba4f78f307396a7;p=releng%2Fbuilder.git

Make autorelease run validation on patch submit

Change-Id: I0dd667f3d81e013fde7c44de301c7d2b70fd44ef
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 00316524b..4447d6f50 100644
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -28,10 +28,15 @@
     name: autorelease-checkout-gerrit-patch
     builders:
       - shell: |
-          cd ${GERRIT_PROJECT}
+          #!/bin/bash
+          set -eu -o pipefail
+
+          # If the project is autorelease then we do not need to cd
+          if [ "$GERRIT_PROJECT" != "releng/autorelease" ]; then
+              cd "$WORKSPACE/$GERRIT_PROJECT"
+          fi
           echo "Checking out ${GERRIT_PROJECT} patch ${GERRIT_REFSPEC}..."
           git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
-          cd ..
 
 - builder:
     name: autorelease-cfp
diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index ffb06f79e..612dd9f51 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -2,9 +2,10 @@
 - project:
     name: autorelease-projects
     jobs:
+      - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}'
-      - autorelease-generate-release-notes-{stream}
-      - autorelease-version-bump-{stream}
+      - 'autorelease-version-bump-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
 
     stream:
       - nitrogen:
@@ -28,7 +29,8 @@
           integration-test: boron
           karaf-version: karaf3
 
-    project: 'releng/autorelease'
+    project: releng/autorelease
+    project-name: autorelease
     archive-artifacts: >
         **/*.prop
         **/*.log