diff --git a/roles/taskotron/taskotron-trigger/tasks/main.yml b/roles/taskotron/taskotron-trigger/tasks/main.yml index 3cd3b316ab..94201545b3 100644 --- a/roles/taskotron/taskotron-trigger/tasks/main.yml +++ b/roles/taskotron/taskotron-trigger/tasks/main.yml @@ -28,7 +28,7 @@ template: src=trigger_rules.yml.j2 dest=/etc/taskotron/trigger_rules.yml owner=root group=root mode=0744 notify: - restart fedmsg-hub - when: deployment_type in ['dev'] + when: deployment_type in ['dev', 'stg'] - name: copy fedmsg logging configuration copy: src=logging.py dest=/etc/fedmsg.d/logging.py owner=root group=root mode=0744 diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 index e088fe6b4a..202fb8ea04 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 @@ -1,4 +1,4 @@ -{% if deployment_type in ['stg', 'prod'] %} +{% if deployment_type in ['prod'] %} [buildbot] url = http://127.0.0.1:8080/change_hook @@ -17,11 +17,7 @@ joblog_file = {{ trigger_joblog_file }} fuse_delay = 900 ; 15 minutes in seconds [distgit] -{% if deployment_type in ['stg'] %} -enabled = True -{% else %} enabled = False -{% endif %} cache_dir = {{ trigger_cache_dir }} repo_url = {{ trigger_distgit_repo_url }} namespace = rpms-checks @@ -29,7 +25,7 @@ namespace = rpms-checks [abicheck] critpath_filepath = {{ trigger_critpath_file }} critpath_exclude = firefox,thunderbird,kernel,kdelibs,kdepim,qt -{% elif deployment_type in ['dev'] %} +{% elif deployment_type in ['dev', 'stg'] %} [buildbot] url = http://127.0.0.1:8080/change_hook diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index ab3942f6a4..c9fb1225db 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -1,8 +1,10 @@ --- +{% if deployment_type in ['dev', 'stg'] %} - when: {message_type: KojiBuildPackageCompleted} do: - {tasks: [rpmlint, rpmgrill, python-versions]} - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms-checks/${name}.git', branch: "${distgit_branch}"}} +{% endif %} - when: {message_type: KojiBuildDockerCompleted} do: - {tasks: [simpledocker]}