From 9e30846360b6023e7e734578a8a87fe0ed86467c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Wed, 25 Jul 2018 13:38:42 +0200 Subject: [PATCH] taskotron: merge trigger rules config files --- .../templates/trigger_rules.yml.j2 | 13 +++++ .../templates/trigger_rules.yml.j2.dev | 56 ------------------- 2 files changed, 13 insertions(+), 56 deletions(-) delete mode 100644 roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index 7461a521b2..8176419aa9 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -45,3 +45,16 @@ arches: - noarch +{% if deployment_type in ['dev'] %} +{# This is sufficient to run in a single environment only #} +- when: + message_type: PagureGitReceive + repo: + $regex: '/taskotron\/.+/' + do: + - discover: {repo: 'https://pagure.io/taskotron/task-dockerbuild.git'} + arches: + - x86_64 + match_host_arch: True +{% endif%} + diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev deleted file mode 100644 index 48d583154e..0000000000 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev +++ /dev/null @@ -1,56 +0,0 @@ ---- -- when: - message_type: KojiBuildPackageCompleted - do: - - tasks: - - rpmlint - - tasks: - - python-versions - - rpmgrill - arches: - - noarch - -- when: - message_type: KojiBuildPackageCompleted - name: - $nin: [{{ trigger_abicheck_blacklist | join(',') }}] - do: - - tasks: - - abicheck - -- when: - message_type: KojiTagChanged - tag: - $regex: '/^f[0-9]{2}-updates(-testing)?-pending$$/' - do: - - tasks: - - rpmdeplint - -- when: - message_type: DistGitCommit - namespace: modules - do: - - tasks: - - check_modulemd - arches: - - noarch - -- when: - message_type: GitHubPullRequestOpened - repo_name: - $regex: '/^container-images\/.+/' - do: - - tasks: - - mtf-containers - arches: - - noarch - -- when: - message_type: PagureGitReceive - repo: - $regex: '/taskotron\/.+/' - do: - - discover: {repo: 'https://pagure.io/taskotron/task-dockerbuild.git'} - arches: - - x86_64 - match_host_arch: True