From ec2a126a59ef5a2744808dc2c23a2b6e81c3d978 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Mon, 13 Oct 2014 09:03:54 +0000 Subject: [PATCH] qadevel buildmaster: add openstack slave for testing --- .../templates/ci.master.cfg.j2 | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 index f6fc887d64..d903dd0e7d 100644 --- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 @@ -14,6 +14,8 @@ c = BuildmasterConfig = {} # a BuildSlave object, specifying a unique slave name and password. The same # slave name and password must be configured on the slave. from buildbot.buildslave import BuildSlave +from buildbot.buildslave import openstack + c['slaves'] = [ {% for buildslave in buildslaves %} {% if deployment_type == 'qadevel-stg' %} @@ -25,6 +27,19 @@ c['slaves'] = [ {% endfor %} ] +c['slaves'].append( + openstack.OpenStackLatentBuildSlave( + "{{ qadevel_stg_buildslave_user }}", + "{{ qadevel_stg_buildslave_password }}", + flavor=1, + image="5345b501-9264-4198-a185-eb5a2282fed0", + os_username="{{ taskotron_openstack_username }}", + os_password="{{ taskotron_openstack_password }}", + os_tenant_name="{{ taskotron_openstack_tenant_name }}", + os_auth_url="https://fed-cloud02.cloud.fedoraproject.org:5001/v2.0" + ) + ) + # 'slavePortnum' defines the TCP port to listen on for connections from slaves. # This must match the value configured into the buildslaves (with their # --master option) @@ -109,6 +124,11 @@ c['schedulers'].append(ForceScheduler( name="force", builderNames=["trigger-builder", "libtaskotron-builder", "resultsdb-builder", "resultsdb_api-builder", "fake_fedorainfra-builder"])) +c['schedulers'].append(ForceScheduler( + name="openstack-force", + builderNames=["openstack-builder"])) + + ####### BUILDERS # The 'builders' list defines the Builders, which tell Buildbot how to perform a build: @@ -163,6 +183,11 @@ c['builders'].append( slavenames=[{% for buildslave in buildslaves %}"{{ buildslave }}",{% endfor %}], factory=fake_fedorainfra_factory)) +c['builders'].append( + BuilderConfig(name="openstack-builder", + slavenames=["{{ qadevel_stg_buildslave_user }}"], + factory=trigger_factory)) + ####### STATUS TARGETS