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

enabling per-package dist-git tasks in taskotron prod

Browse source
This commit is contained in:
Tim Flink 2017-03-16 18:12:31 +00:00
parent 8c97a0c242
commit 3a4099fc8c
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/taskotron-prod
View file

@ -39,7 +39,7 @@ resultsdb_fe_endpoint: resultsdb
resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb resultsdb_frontend_url: http://resultsdb01.qa.fedoraproject.org/resultsdb
resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0 resultsdb_url: http://resultsdb01.qa.fedoraproject.org/resultsdb_api/api/v2.0
taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/
trigger_distgit_repo_url: http://pkgs.fedoraproject.org/git trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org
instances: instances:
- { name: "Production", url: "https://taskotron.fedoraproject.org"} - { name: "Production", url: "https://taskotron.fedoraproject.org"}
- { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"} - { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"}

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

@ -129,7 +129,7 @@ c['schedulers'].append(ForceScheduler(
default='x86_64', default='x86_64',
size=128)])) size=128)]))
{% if deployment_type in ['dev', 'stg'] %} {% if deployment_type in ['dev', 'stg', 'prod'] %}
c['schedulers'].append(JobScheduler( c['schedulers'].append(JobScheduler(
name="jobsched-distgit", name="jobsched-distgit",
builderNames=['distgit'], builderNames=['distgit'],
@ -246,7 +246,7 @@ factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log',
mode=0644)) mode=0644))
{% endif %} {% endif %}
{% if deployment_type in ['dev', 'stg'] %} {% if deployment_type in ['dev', 'stg', 'prod'] %}
# this is for package-specific tasks # this is for package-specific tasks
distgit_factory = BuildFactory() distgit_factory = BuildFactory()
@ -255,7 +255,7 @@ distgit_factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskot
{% if deployment_type in ['dev', 'prod'] %} {% if deployment_type in ['dev', 'prod'] %}
# check out the source from prod dist-git # check out the source from prod dist-git
distgit_factory.addStep(Git(repourl=Property('repo', default=Interpolate('http://pkgs01.phx2.fedoraproject.org/rpms/{}/'.format("%(prop:item)s".split('-')[0]))), distgit_factory.addStep(Git(repourl=Property('repo', default=Interpolate('http://pkgs02.phx2.fedoraproject.org/rpms/{}/'.format("%(prop:item)s".split('-')[0]))),
branch=Property('branch', default='master'), branch=Property('branch', default='master'),
mode='full', mode='full',
method='clobber', method='clobber',
@ -351,13 +351,11 @@ c['builders'].append(
factory=factory, locks=[build_lock.access('counting')], factory=factory, locks=[build_lock.access('counting')],
mergeRequests=False)) mergeRequests=False))
{% if deployment_type in ['dev', 'stg'] %}
c['builders'].append( c['builders'].append(
BuilderConfig(name="distgit", BuilderConfig(name="distgit",
slavenames=[{% for buildslave in x86_64_buildslaves %}"{{ buildslave }}",{% endfor %}], slavenames=[{% for buildslave in x86_64_buildslaves %}"{{ buildslave }}",{% endfor %}],
factory=distgit_factory, locks=[build_lock.access('counting')], factory=distgit_factory, locks=[build_lock.access('counting')],
mergeRequests=False)) mergeRequests=False))
{% endif %}
####### STATUS TARGETS ####### STATUS TARGETS
# 'status' is a list of Status Targets. The results of each build will be # 'status' is a list of Status Targets. The results of each build will be

6
roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2
View file

@ -1,14 +1,8 @@
--- ---
{% if deployment_type in ['dev', 'stg'] %}
- when: {message_type: KojiBuildPackageCompleted} - when: {message_type: KojiBuildPackageCompleted}
do: do:
- {tasks: [rpmlint, rpmgrill, python-versions]} - {tasks: [rpmlint, rpmgrill, python-versions]}
- {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}} - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}}
{% else %}
- when: {message_type: KojiBuildPackageCompleted}
do:
- {tasks: [rpmlint, rpmgrill, python-versions]}
{% endif %}
- when: {message_type: KojiBuildDockerCompleted} - when: {message_type: KojiBuildDockerCompleted}
do: do:
- {tasks: [simpledocker]} - {tasks: [simpledocker]}