Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

updating qa-stg buildbot to work better w/ proposed build changes in libtaskotron

Browse source
This commit is contained in:
Tim Flink 2016-04-04 19:51:15 +00:00
parent 99ec01b6ac
commit 575b13e5c7
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
View file

@ -160,6 +160,7 @@ from buildbot.process.factory import BuildFactory
from buildbot.steps.source.git import Git from buildbot.steps.source.git import Git
from buildbot.steps.shell import ShellCommand from buildbot.steps.shell import ShellCommand
from buildbot.process.properties import Property, Interpolate from buildbot.process.properties import Property, Interpolate
from buildbot.steps.transfer import DirectoryUpload
@ -172,7 +173,6 @@ def create_test_factory(repo_name, func=True):
factory.addStep(ShellCommand(command=['virtualenv', '--system-site-packages', 'env'])) factory.addStep(ShellCommand(command=['virtualenv', '--system-site-packages', 'env']))
factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; pip install -r requirements.txt'])) factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; pip install -r requirements.txt']))
factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; TEST="true" py.test %s testing/' % '-F' if func else ''], name=repo_name)) factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; TEST="true" py.test %s testing/' % '-F' if func else ''], name=repo_name))
return factory return factory
@ -184,22 +184,22 @@ def create_test_factory(repo_name, func=True):
# factory.addStep(Git(repourl=Interpolate('{{ repo_base }}/%s.git' % repo_name), # factory.addStep(Git(repourl=Interpolate('{{ repo_base }}/%s.git' % repo_name),
# mode='full', env={'GIT_SSL_NO_VERIFY': 'yes'}, # mode='full', env={'GIT_SSL_NO_VERIFY': 'yes'},
# method='clobber')) # method='clobber'))
factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/fedoraqa/%s.git' % repo_name), factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/tflink/%s.git' % repo_name),
mode='full',method='clobber')) mode='full',method='clobber'))
factory.addStep(ShellCommand(command=['doit', 'envtype=ci', 'test'], descriptionDone = ['run tests'])) factory.addStep(ShellCommand(command=['doit', 'envtype=ci', 'test'], descriptionDone = ['run tests']))
factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'chainbuild'], descriptionDone=['Chainbuild RPMs'])) factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/builds/%(prop:Project)s'), 'envtype=ci', 'chainbuild'], descriptionDone=['Chainbuild RPMs']))
factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'], descriptionDone=['Build Documentation'])) factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/docs/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'], descriptionDone=['Build Documentation']))
factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'], descriptionDone=['Update Release Symlinks'])) factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/docs/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'], descriptionDone=['Update Symlinks']))
return factory return factory
{% endif %} {% endif %}
trigger_factory = create_test_factory('taskotron-trigger') #trigger_factory = create_test_factory('taskotron-trigger')
libtaskotron_factory = create_test_factory('libtaskotron') libtaskotron_factory = create_test_factory('libtaskotron-docs')
resultsdb_factory = create_test_factory('resultsdb') #resultsdb_factory = create_test_factory('resultsdb')
resultsdb_api_factory = create_test_factory('resultsdb_api') #resultsdb_api_factory = create_test_factory('resultsdb_api')
fake_fedorainfra_factory = create_test_factory('fake_fedorainfra') #fake_fedorainfra_factory = create_test_factory('fake_fedorainfra')
from buildbot.config import BuilderConfig from buildbot.config import BuilderConfig