Change branch specifiers from ** to origin

Also remove unnecessary origin/ from REFSPEC

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8598da593119479c8f4e084e8720ad91343c0642..cb87eeddaf06110c8f5e35792a9b689d6f1a2683 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -23,7 +23,7 @@
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
             scm-url: 'ssh://jenkins-releng@git.opendaylight.org:29418/releng/builder'
-            refspec: 'origin/$GERRIT_REFSPEC'
+            refspec: '$GERRIT_REFSPEC'
 
     wrappers:
         - ssh-agent-credentials:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 8d88eddfcff175db1a01a3354cc8f7b819329ffd..f41ad0ca16595d685319135909bcee0139178614 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -16,7 +16,7 @@
             url: '{scm-url}'
             refspec: ''
             branches:
-                - '**/{branch}'
+                - 'origin/{branch}'
             skip-tag: true
 
 - scm:
@@ -27,7 +27,7 @@
             url: '{scm-url}'
             refspec: '{refspec}'
             branches:
-                - '**/$GERRIT_BRANCH'
+                - 'origin/$GERRIT_BRANCH'
             skip-tag: true
             choosing-strategy: gerrit