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

fixing some more minutiae to make dist-git urls render correctly in trigger config

Browse source
This commit is contained in:
Tim Flink 2017-03-16 18:03:05 +00:00
parent 097b744753
commit 1ac14680c9
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/taskotron-dev
View file

@ -52,7 +52,8 @@ resultsdb_fe_endpoint: resultsdb
resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/
resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0 resultsdb_url: http://resultsdb-dev01.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: git://pkgs02.phx2.fedoraproject.org/ # make sure this doesn't have a trailing slash
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"}

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

@ -3,7 +3,7 @@
- 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}.git', 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 %} {% else %}
- when: {message_type: KojiBuildPackageCompleted} - when: {message_type: KojiBuildPackageCompleted}
do: do: