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

taskotron-dev: revert experimental changes

Browse source
This commit is contained in:
Martin Krizek 2017-03-10 08:36:32 +00:00
parent 4125d2d3c7
commit da911be7cd
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/taskotron-dev-client-hosts
View file

@ -40,8 +40,8 @@ taskotron_fas_password: ''
execdb_external_url: https://taskotron-dev.fedoraproject.org/execdb execdb_external_url: https://taskotron-dev.fedoraproject.org/execdb
resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0 resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0
bodhi_server: https://bodhi.fedoraproject.org/ bodhi_server: https://bodhi.fedoraproject.org/
kojihub_url: https://koji.stg.fedoraproject.org/kojihub kojihub_url: https://koji.fedoraproject.org/kojihub
kojipkg_url: https://kojipkgs.stg.fedoraproject.org/packages kojipkg_url: https://kojipkgs.fedoraproject.org/packages
taskotron_master: https://taskotron-dev.fedoraproject.org/taskmaster taskotron_master: https://taskotron-dev.fedoraproject.org/taskmaster
resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb
artifacts_base_url: https://taskotron-dev.fedoraproject.org/artifacts artifacts_base_url: https://taskotron-dev.fedoraproject.org/artifacts

2
roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2
View file

@ -12,7 +12,7 @@ joblog_file = {{ trigger_joblog_file }}
fuse_delay = 900 ; 15 minutes in seconds fuse_delay = 900 ; 15 minutes in seconds
git_cache_dir = {{ trigger_cache_dir }} git_cache_dir = {{ trigger_cache_dir }}
rules_template = {{ trigger_rules_template_path }} rules_template = {{ trigger_rules_template_path }}
{% if deployment_type in ['dev', 'stg'] %} {% if deployment_type in ['stg'] %}
deployment_type = stg deployment_type = stg
{% endif%} {% endif%}

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

@ -31,7 +31,7 @@
{% else %} {% else %}
- {tasks: [depcheck]} - {tasks: [depcheck]}
{% endif %} {% endif %}
{% if deployment_type not in ['dev', 'stg'] %} {% if deployment_type not in ['stg'] %}
{# stg bodhi doesn't have the info we need, stg koji doesn't have the builds from prod bodhi #} {# stg bodhi doesn't have the info we need, stg koji doesn't have the builds from prod bodhi #}
- when: - when:
message_type: KojiTagChanged message_type: KojiTagChanged
@ -39,7 +39,7 @@
do: do:
- {tasks: [upgradepath]} - {tasks: [upgradepath]}
{% endif %} {% endif %}
{% if deployment_type in ['dev', 'stg'] %} {% if deployment_type in ['stg'] %}
- when: {message_type: DistGitCommit, namespace: modules} - when: {message_type: DistGitCommit, namespace: modules}
do: do:
- {tasks: [check_modulemd]} - {tasks: [check_modulemd]}