move server name to parameter so we can use different server names

Change-Id: I512a95f34807ae763550d32f81f1500c71b5a2f9
Signed-off-by: Sandra Biton <sandra.biton@hpe.com>

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index a24dcceee5fadaee764f1526d1ea6ff1df229fb6..1a5b7810051b2d5c7df9999a83815dc168141d6c 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -38,7 +38,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -90,7 +90,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 486d164f3964efff5b4dc28752f342ca46be1a10..35827cbd2e5885df119bbc80b517f721207e4f75 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -57,6 +57,7 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'integration/distribution'
             branch: '{branch}'
 
@@ -137,6 +138,7 @@
     triggers:
         - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'integration/distribution'
             branch: '{branch}'
 

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c7ab8979c00177b3c19aed59c36872bbd4ad9d34..5ade45a1b1bd49d50fb477a280bb2ceeb46c9452 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -127,7 +127,7 @@
     name: integration-trigger-patch-submitted
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c48a183770805b50b75116eef693c44b9f6d1dd4..47f92ea78191fb1bf669dfaa4ca6c751ab3eaf01 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -79,6 +79,7 @@
 
     triggers:
         - integration-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'integration/test'
             branch: 'master'
             pattern: 'csit/suites/{project}/**'
@@ -491,6 +492,7 @@
 
     triggers:
         - integration-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'integration/test'
             branch: 'master'
             pattern: 'csit/suites/{project}/**'
@@ -1252,7 +1254,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'test-{project}-all'

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index b4126cbe7b6e7016bb6e8cc780f8916541e422c4..96300fb8db240daea94f58f5aa76059ac6bdb8a5 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -244,6 +244,7 @@
 
     triggers:
         - integration-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'integration/test'
             branch: 'master'
             pattern: 'csit/libraries/*'
@@ -353,7 +354,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'test-integration'

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 3b7760beb1874f52f46cd9083cb7c8c296904ea9..c632879e7bab253823af9fda32f638fa4187a5fd 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -167,7 +167,7 @@
     triggers:
         - timed: '@midnight'
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
               - comment-added-contains-event:
                  comment-contains-value: 'runit'

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index 695bb1becebd75c6e911e3d4b3cc79d60922c521..571d0d316e33ae602b6effce255dc38fcae0fa32 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -48,6 +48,7 @@
     triggers:
         - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
+            server-name: '{server-name}'
             name: 'netvirt'
 
     builders:

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 658063d7440869dea193c3c0481d3c43e4f81505..cc5861c34863422ef84bf375fd57e774a41db26f 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -72,6 +72,7 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: 'opflex'
             branch: '{branch}'
 
@@ -117,6 +118,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'opflex'
             branch: '{branch}'
 

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 82b321a6963a618bc0e1d2cdd1b54642b665defc..7e376f7b57c648b3f3c6b51ea1fea4c859e3306e 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -134,7 +134,7 @@
     triggers:
         - timed: '@midnight'
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
               - comment-added-contains-event:
                  comment-contains-value: 'runit'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index a1cd88cfdc3225aea818d8f34827caf9043620a6..571251ea99830500c2150aa518d2c6a48c52efc4 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -38,6 +38,7 @@
     triggers:
         - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
+            server-name: '{server-name}'
             name: 'ovsdb'
 
     builders:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 0f2a8a18f4d88ce1664701b72eecfd78ca5020fb..4b8ba08b1e397411167b4c1ca2cdcfadc8f7a225 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -13,6 +13,7 @@
 
     email-recipients: 'jenkins@lists.opendaylight.org'
     odl-ml2-driver-repo: 'https://github.com/openstack/networking-odl'
+    server-name: 'OpenDaylight'
 
     # openstack-infra-parameters defaults
     archive-artifacts: ''

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 985b7e62af3084337b114565d3e2f8e2bbb2945d..c5924001db84462496494b89063e0b9f5699ec87 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -71,7 +71,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -134,7 +134,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -201,7 +201,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -337,7 +337,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -398,7 +398,7 @@
     triggers:
         - timed: '00 10 1 * *'
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index af82785503909f65b712f2cccfdaef35477b05cc..c9b7a8f6e1878dc755d8ca222f27f93ff27260d3 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -131,7 +131,7 @@
     name: gerrit-trigger-patch-submitted
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -153,7 +153,7 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -187,7 +187,7 @@
     name: gerrit-trigger-patch-sonar
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - comment-added-contains-event:
                     comment-contains-value: 'run-sonar'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 7f5e0367548f1423c4e51b7419042044fa603464..d0c10aa2ac8d1836cc55f2526377725a87342543 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -174,7 +174,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -351,6 +351,7 @@
     triggers:
         - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: '{project}'
             branch: '{branch}'
 
@@ -514,6 +515,7 @@
     triggers:
         - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
+            server-name: '{server-name}'
             name: '{project}'
 
     builders:
@@ -597,7 +599,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -688,6 +690,7 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
+            server-name: '{server-name}'
             name: '{project}'
             branch: '{branch}'
 

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index f6605551b459c7187ee3468ee386fefd7ed40d99..d6102cf622c01a0e1ee4858c2d7ab244fe1ee7b8 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -152,7 +152,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
@@ -245,6 +245,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: '{project}'
             branch: '{branch}'
 
@@ -310,7 +311,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index a01779c96d24af15b65ff91db3ddd6d25a4d03a4..45c1b34219325722c2ef2cb2a89e03d59a12d0dd 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -54,7 +54,7 @@
 
     triggers:
         - gerrit:
-            server-name: 'OpenDaylight'
+            server-name: '{server-name}'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 6894c7a53a71a1feb4b79fbc5b12822fa843f9ba..c8bff2e7ca1d52a933b1e5ada1455ef7767572cf 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -37,6 +37,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'spectrometer'
             branch: 'master'