X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=bc9ebb8f96b7a7c302bc0f5f876853c3b2163411;hb=d30c28b1a0c09625a30f4aa315816a1ef0b710ff;hp=64ce604c30175dfa76f84659720f2438b37cacf4;hpb=ae3c1d1553570e704ddd88fcf5d96f2d64ae8fff;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 64ce604c3..bc9ebb8f9 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -174,7 +174,7 @@
 # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
 # Arguments:
-#     server: name of gerrit server to listen to
+#     gerrit-server-name: name of gerrit server to listen to
 #     project: pattern to match triggering projects
 #     branch: triggering branch name
 #     files: pattern to match triggering filepaths
@@ -182,7 +182,7 @@
     name: gerrit-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
@@ -206,7 +206,7 @@
     name: gerrit-trigger-patch-merged
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
@@ -241,7 +241,7 @@
     name: gerrit-trigger-patch-sonar
     triggers:
       - gerrit:
-          server-name: '{server-name}'
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: 'run-sonar'
@@ -431,7 +431,7 @@
           files:
             - file-id: npmrc
               target: '$HOME/.npmrc'
-            - file-id: rackspace-heat
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
       - timeout:
           type: absolute
@@ -445,22 +445,6 @@
       - openstack:
           single-use: true
 
-- builder:
-    # TODO: Verify signature after downloading users public key from a locally created
-    # repository instead of the public keymesh. This requires a process in place to get ODL
-    # developers public keys into a local repository without increasing the job thoughput.
-    name: verify-gpg-signature
-    builders:
-      - shell: !include-raw: verify-gpg-signatures.sh
-
-- builder:
-    name: opendaylight-infra-jjbini
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: 'jjbini'
-              target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'
-
 - publisher:
     name: opendaylight-infra-generate-csit-status-report
     publishers: