diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 8858254366..52fc1b0978 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -23,7 +23,6 @@ grokmirror_basedir: /var/lib/git/mirror grokmirror_user: grokmirror grokmirror_repos: - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'} - - { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'} - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'} - { name: fedoraqa/dockerautotest, url: 'https://bitbucket.org/fedoraqa/task-dockerautotest.git'} - { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'} diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg index 6677ee3650..a6b91702f8 100644 --- a/inventory/group_vars/taskotron-stg +++ b/inventory/group_vars/taskotron-stg @@ -24,7 +24,6 @@ grokmirror_basedir: /var/lib/git/mirror grokmirror_user: grokmirror grokmirror_repos: - { name: fedoraqa/rpmlint, url: 'https://bitbucket.org/fedoraqa/task-rpmlint.git'} - - { name: fedoraqa/depcheck, url: 'https://bitbucket.org/fedoraqa/task-depcheck.git'} - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'} - { name: fedoraqa/dockerautotest, url: 'https://bitbucket.org/fedoraqa/task-dockerautotest.git'} - { name: fedoraqa/abicheck, url: 'https://pagure.io/task-abicheck.git'} diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index cbc52340b7..1145ccab9a 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -20,7 +20,12 @@ - {tasks: [abicheck]} - when: {message_type: KojiTagChanged} do: +{% if deployment_type in ['dev', 'stg'] %} + - {tasks: [rpmdeplint]} +{% else %} - {tasks: [depcheck, rpmdeplint]} +{% endif %} + {% 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 #} - when: