On Thu, Jan 16, 2014 at 11:33 AM, Helga Velroyen <[email protected]> wrote: > (sorry for the extras slashes in the subject) > > > On Thu, Jan 16, 2014 at 11:33 AM, Helga Velroyen <[email protected]> wrote: >> >> This adds the newly created stable-2.11 to the buildbot >> configuration. >> >> Signed-off-by: Helga Velroyen <[email protected]> >> --- >> roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg | 8 >> +++++--- >> 1 file changed, 5 insertions(+), 3 deletions(-) >> >> diff --git >> a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg >> b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg >> index bd03101..d4dec00 100644 >> --- a/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg >> +++ b/roles/buildmaster/files/srv/buildbot/masters/ganeti/master.cfg >> @@ -71,9 +71,11 @@ def GetBranches(*args): >> for name in ["stable"]] >> >> >> -UNITTEST_BRANCHES = [MASTER_BRANCH] + GetBranches("2.6", "2.7", "2.8", >> "2.9", "2.10") >> -KVM_QA_BRANCHES = [MASTER_BRANCH] + GetBranches("2.10") >> -VCLUSTER_QA_BRANCHES = [MASTER_BRANCH] + GetBranches("2.9", "2.10") >> +UNITTEST_BRANCHES = [MASTER_BRANCH] + GetBranches("2.6", "2.7", "2.8", >> "2.9", "2.10", "2.11") >> +# KVM supported from 2.10 on, add new versions here >> +KVM_QA_BRANCHES = [MASTER_BRANCH] + GetBranches("2.10", "2.11") >> +# vcluster is implemented from 2.9 on, add new versions here >> +VCLUSTER_QA_BRANCHES = [MASTER_BRANCH] + GetBranches("2.9", "2.10", >> "2.11") >> >> QA_FULL = "full" >> QA_QUICK = "quick" >> -- >> 1.8.5.2 >> > > > > -- > -- > Helga Velroyen | Software Engineer | [email protected] | > > Google Germany GmbH > Dienerstr. 12 > 80331 München > > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschäftsführer: Graham Law, Christine Elizabeth Flores
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
