From 53645311f1a4e186adeeca303ad98d94397f4b05 Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Tue, 16 Feb 2016 12:56:52 +0000 Subject: [PATCH] Ensure the right password is used Update zuul layout --- nodepool/nodepool.yaml | 2 +- zuul/layout.yaml | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index a528e65..1c6ffbd 100644 --- 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 3a87990..9e1b3eb 100644 --- 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 -- 2.39.5