From 1ac14680c9cfbd1f35fd8c465b59897c7db09900 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 16 Mar 2017 18:03:05 +0000 Subject: [PATCH] fixing some more minutiae to make dist-git urls render correctly in trigger config --- inventory/group_vars/taskotron-dev | 3 ++- .../taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 421a24346e..37bf0b23eb 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -52,7 +52,8 @@ resultsdb_fe_endpoint: resultsdb resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v2.0 taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ -trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org/ +# make sure this doesn't have a trailing slash +trigger_distgit_repo_url: git://pkgs02.phx2.fedoraproject.org instances: - { name: "Production", url: "https://taskotron.fedoraproject.org"} - { name: "Staging", url: "https://taskotron.stg.fedoraproject.org"} diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index 363f478956..24bc6979c9 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -3,7 +3,7 @@ - when: {message_type: KojiBuildPackageCompleted} do: - {tasks: [rpmlint, rpmgrill, python-versions]} - - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}.git', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}} + - {discover: {repo: '{{ trigger_distgit_repo_url }}/rpms/${name}', branch: "${distgit_branch}", fallback_branch: 'master', recursive: true}} {% else %} - when: {message_type: KojiBuildPackageCompleted} do: