From 8a8d908c96b92553d53ed469d65ca86d722e32c1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 23 Jan 2012 15:16:06 -0800 Subject: [PATCH] Add tox to jenkins slave configs. Change-Id: I1528afc878c65abfd83a6a9418631a1c392e2a5a --- manifests/site.pp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index 06364f08ab..b8da8b413e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -203,10 +203,28 @@ node "devstack-oneiric.template.openstack.org" { # # Jenkins slaves: # -node /^.*\.slave\.openstack\.org$/ { +node /^build.*\.slave\.openstack\.org$/ { include openstack_jenkins_slave } +node /^dev.*\.slave\.openstack\.org$/ { + include openstack_jenkins_slave +} + +node /^oneiric.*\.slave\.openstack\.org$/ { + include openstack_jenkins_slave + + package { "mercurial": + ensure => "latest", + } + + package { "tox": + ensure => latest, + provider => pip, + require => Package[python-pip], + } +} + node /^deploy.*.openstack\.org$/ { include openstack_jenkins_slave include orchestra