From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 16 Oct 2017 17:14:07 +0000 (-0400)
Subject: Update RTD Gerrit job to check GERRIT_* variables
X-Git-Tag: v0.11.0~15
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=ac63e87ea0026fc6a4db4cc39af98dcd7fb7dd0d;p=releng%2Fglobal-jjb.git

Update RTD Gerrit job to check GERRIT_* variables

This allows the job to handle branch '*' more easily..

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

diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
index 47604275..3d8f4931 100644
--- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
+++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
@@ -81,14 +81,14 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
     <userRemoteConfigs>
       <hudson.plugins.git.UserRemoteConfig>
         <name>origin</name>
-        <refspec/>
+        <refspec>$GERRIT_REFSPEC</refspec>
         <url>$GIT_URL/$PROJECT</url>
         <credentialsId>test-credential</credentialsId>
       </hudson.plugins.git.UserRemoteConfig>
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>refs/heads/master</name>
+        <name>refs/heads/$GERRIT_BRANCH</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <excludedUsers/>
diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 9feaec19..8e9def99 100644
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -245,10 +245,10 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          branch: '{branch}'
+          branch: '$GERRIT_BRANCH'
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}'
-          refspec: ''
+          refspec: '$GERRIT_REFSPEC'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default