From 30558d6d91575a1fc3d7c1909c18c0c955942f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Tue, 29 May 2018 09:52:25 +0200 Subject: [PATCH 1/2] taskotron-trigger: enable per-arch tasks on stg --- .../taskotron-trigger/templates/trigger.cfg.j2 | 2 +- .../{trigger.cfg.j2.dev => trigger.cfg.j2.prod} | 2 +- .../taskotron-trigger/templates/trigger_rules.yml.j2 | 10 +++++++++- ...gger_rules.yml.j2.dev => trigger_rules.yml.j2.prod} | 10 +--------- 4 files changed, 12 insertions(+), 12 deletions(-) rename roles/taskotron/taskotron-trigger/templates/{trigger.cfg.j2.dev => trigger.cfg.j2.prod} (95%) rename roles/taskotron/taskotron-trigger/templates/{trigger_rules.yml.j2.dev => trigger_rules.yml.j2.prod} (86%) diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 index 5e3a0ab8d1..73f48feccb 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2 @@ -2,7 +2,7 @@ url = http://127.0.0.1:8080/change_hook [trigger] -valid_arches = x86_64 +valid_arches = x86_64,armhfp koji_url = http://koji.fedoraproject.org/kojihub datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw execdb_server = {{ execdb_server }} diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod similarity index 95% rename from roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev rename to roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod index 73f48feccb..5e3a0ab8d1 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.dev +++ b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod @@ -2,7 +2,7 @@ url = http://127.0.0.1:8080/change_hook [trigger] -valid_arches = x86_64,armhfp +valid_arches = x86_64 koji_url = http://koji.fedoraproject.org/kojihub datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw execdb_server = {{ execdb_server }} diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index b407b9daae..7461a521b2 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -2,10 +2,13 @@ - when: message_type: KojiBuildPackageCompleted do: + - tasks: + - rpmlint - tasks: - python-versions - rpmgrill - - rpmlint + arches: + - noarch - when: message_type: KojiBuildPackageCompleted @@ -29,6 +32,8 @@ do: - tasks: - check_modulemd + arches: + - noarch - when: message_type: GitHubPullRequestOpened @@ -37,3 +42,6 @@ do: - tasks: - mtf-containers + arches: + - noarch + diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod similarity index 86% rename from roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev rename to roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod index 7461a521b2..b407b9daae 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.dev +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod @@ -2,13 +2,10 @@ - when: message_type: KojiBuildPackageCompleted do: - - tasks: - - rpmlint - tasks: - python-versions - rpmgrill - arches: - - noarch + - rpmlint - when: message_type: KojiBuildPackageCompleted @@ -32,8 +29,6 @@ do: - tasks: - check_modulemd - arches: - - noarch - when: message_type: GitHubPullRequestOpened @@ -42,6 +37,3 @@ do: - tasks: - mtf-containers - arches: - - noarch - From 1ff9c5ca99b1c16ef226caf3f4003c547ece13f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Tue, 29 May 2018 10:26:42 +0200 Subject: [PATCH 2/2] taskotron-trigger: deploy per-arch tasks on prod --- .../templates/trigger.cfg.j2.prod | 23 ----------- .../templates/trigger_rules.yml.j2.prod | 39 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod delete mode 100644 roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod diff --git a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod b/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod deleted file mode 100644 index 5e3a0ab8d1..0000000000 --- a/roles/taskotron/taskotron-trigger/templates/trigger.cfg.j2.prod +++ /dev/null @@ -1,23 +0,0 @@ -[buildbot] -url = http://127.0.0.1:8080/change_hook - -[trigger] -valid_arches = x86_64 -koji_url = http://koji.fedoraproject.org/kojihub -datagrepper_url = https://apps.fedoraproject.org/datagrepper/raw -execdb_server = {{ execdb_server }} -runner_type = BuildbotRunner -job_logging = True -joblog_file = {{ trigger_joblog_file }} -fuse_delay = 900 ; 15 minutes in seconds -git_cache_dir = {{ trigger_cache_dir }} -rules_template = {{ trigger_rules_template_path }} -{# enable this if you want taskotron-stg to react to just stg fedmsgs -{% if deployment_type in ['stg'] %} -deployment_type = stg -{% endif%} -#} - -[koji_build_completed] -critpath_filepath = {{ trigger_critpath_file }} - diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod deleted file mode 100644 index b407b9daae..0000000000 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2.prod +++ /dev/null @@ -1,39 +0,0 @@ ---- -- when: - message_type: KojiBuildPackageCompleted - do: - - tasks: - - python-versions - - rpmgrill - - rpmlint - -- 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 - -- when: - message_type: GitHubPullRequestOpened - repo_name: - $regex: '/^container-images\/.+/' - do: - - tasks: - - mtf-containers