Ensure the right password is used

Update zuul layout

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index a528e65befa5e1803e290e168159a5b611ceaca1..1c6ffbdea6d22eb3dbd97a52d716e22f637696cd 100644 (file)
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -52,7 +52,7 @@ providers:
         #Set the public key part only of the jenkin's key (no whitespace) to the NODEPOOL_SSH_KEY environment variable in order to
         #inject it into the image's jenkins user .ssh/authorized_keys
         #This key will be used to log in and setup jenkins on the target VM
-        #private-key: '/home/nodepool/.ssh/id_rsa'
+        private-key: '/home/nodepool/.ssh/id_rsa'
         config-drive: true
         meta:
             xenapi_use_agent: 'false'

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3a879908118c2ace604b4b86ff1e8be8e6947e9d..9e1b3eb3d6d1eb6b3cefbdc056305333eea8787b 100644 (file)
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -15,21 +15,13 @@ pipelines:
         # recheck trigger that runs the check pipeline jobs when someone
         # adds a comment to a review that says "recheck myvendor".
         - event: comment-added
-          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*recheck myvendor\s*$
+          comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*xen:*\s*recheck\s*$
     success:
       gerrit:
         verified: 1
-      smtp:
-        to: openstack-ci@xenproject.org
-        from: zuul@zuul.openstack.xenproject.org
-        subject: 'Silent check of {change.project} {change.number},{change.patchset} passed'
     failure:
       gerrit:
         verified: -1
-      smtp:
-        to: openstack-ci@xenproject.org
-        from: zuul@zuul.openstack.xenproject.org
-        subject: 'Silent check of {change.project} {change.number},{change.patchset} failed'
     merge-failure:
       smtp:
         to: openstack-ci@xenproject.org