From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 17 May 2016 03:04:59 +0000 (-0400)
Subject: Use correct server-name Primary
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F1164%2F1;p=ci-management.git

Use correct server-name Primary

Perhaps 'Default' was the name at one point and then got renamed to
'Primary' and we forgot to update the configuration. Default is not
currently a valid server-name so resulted in Gerrit Trigger not watching
any valid Gerrit instance for the event-stream.

The current name of the Gerrit server-name is 'Primary' as defined in
Jenkins > Manage Jenkins > Gerrit Trigger.

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

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index c7f907559..d032bcc96 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -107,7 +107,7 @@
     name: gerrit-trigger-patch-submitted
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -129,7 +129,7 @@
     name: gerrit-trigger-manually-triggered
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: '{comment-trigger-value}'
@@ -144,7 +144,7 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 44bcf1337..ecb12b2b3 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -99,7 +99,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-images'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 7e91ffb58..aba5a8a6a 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -124,7 +124,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'Default'
+            server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-images'