From 8a24e2e3e86a7973cf83cddbffd4f45f9e29a235 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 4 Feb 2016 20:01:27 -0800 Subject: [PATCH] Fix wheel release job Fix a typo in the wheel release job. Also make sure that it is not set to offline the node. Change-Id: Ie76331068545173b863d31f1fe793f46b6578700 --- jenkins/jobs/wheel-mirror.yaml | 2 +- zuul/openstack_functions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/jobs/wheel-mirror.yaml b/jenkins/jobs/wheel-mirror.yaml index 888a550423..1fc2f013fd 100644 --- a/jenkins/jobs/wheel-mirror.yaml +++ b/jenkins/jobs/wheel-mirror.yaml @@ -41,7 +41,7 @@ #!/bin/bash -xe echo "Releasing afs volume {volume}." - k5start -t -f /etc/afsadmin.keytab service/afsafdmin -- \ + k5start -t -f /etc/afsadmin.keytab service/afsadmin -- \ vos release -v {volume} echo "Done." diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py index cfa5ac105b..fd73ae13b4 100644 --- a/zuul/openstack_functions.py +++ b/zuul/openstack_functions.py @@ -48,7 +48,7 @@ def set_node_options(item, job, params): proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?|update-liberty))$' # noqa release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$' hook_re = r'^hook-(.*?)-(rtfd)$' - wheel_re = r'^wheel-build-.*$' + wheel_re = r'^wheel-(build|release)-.*$' # jobs run on the persistent proposal, release, and wheel build # workers if (re.match(proposal_re, job.name) or