Make helm verify job checkout gerrit patch

Also change merge and stage job to remove GERRIT_REFSPEC.

Change-Id: I9f93d92065fbd1d5665c2d132d99822156809bf1
Issue-ID: OOM-752
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index d412d9b..f1b015a 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -55,7 +55,7 @@
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
+          choosing-strategy: 'gerrit'
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
@@ -78,7 +78,7 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
 
@@ -111,7 +111,7 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'