From acd845054b977067f55dd9a6c5aa490fd648b8c9 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 14 Jul 2016 07:45:46 +0000 Subject: [PATCH] taskotron-dev: enable task-rpmgrill --- inventory/group_vars/taskotron-dev | 1 + roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 | 1 + roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 0fe7138f18..f353632559 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -27,6 +27,7 @@ grokmirror_repos: - { 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'} + - { name: fedoraqa/rpmgrill, url: 'https://bitbucket.org/fedoraqa/task-rpmgrill.git'} grokmirror_default_branch: develop diff --git a/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 b/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 index cc7668c651..0675a1f1e2 100644 --- a/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/namespaces.yaml.j2 @@ -11,5 +11,6 @@ namespaces_whitelist: - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/depcheck/ - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/upgradepath/ - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/abicheck/ + - {{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/rpmgrill/ pkg: - git://pkgs.fedoraproject.org/rpms-checks/ diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 index bd99c0f2d8..1261aaf332 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 @@ -2,7 +2,11 @@ url = http://127.0.0.1:8080/change_hook [trigger] +{% if deployment_type == 'dev' %} +koji_build_completed_tasks = rpmlint,rpmgrill +{% else %} koji_build_completed_tasks = rpmlint +{% endif %} docker_build_tasks = dockerautotest koji_tag_changed_tasks = upgradepath,depcheck compose_completed_tasks =