From 8a18e8c9f3dc5deaf04fbf8709d74da2eae732ea Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 14 Jan 2016 14:48:13 +0000 Subject: [PATCH] adding buildstep names, removing extra steps for qadevel-stg ci --- .../buildmaster-configure/templates/ci.master.cfg.j2 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 index 505b019643..f1bc5efd22 100644 --- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 @@ -186,12 +186,10 @@ def create_test_factory(repo_name, func=True): # method='clobber')) factory.addStep(Git(repourl=Interpolate('https://bitbucket.org/fedoraqa/%s.git' % repo_name), mode='full',method='clobber')) - 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=['doit', 'envtype=ci', 'test'])) - factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'chainbuild'])) - factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'releasedocs'])) - factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s'), 'envtype=ci', 'buildtype=release', 'updatelatest'])) + 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/static/%(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'])) return factory