diff --git a/inventory/group_vars/resultsdb-stg b/inventory/group_vars/resultsdb-stg index 933d10f7d2..62a0636f6c 100644 --- a/inventory/group_vars/resultsdb-stg +++ b/inventory/group_vars/resultsdb-stg @@ -13,6 +13,9 @@ deployment_type: stg # extra_enablerepos: 'infrastructure-testing' extra_enablerepos: 'infrastructure-testing' +# make sure we're using the stg fedsmg bus +fedmsg_env: stg + ############################################################ # resultsdb details diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg index a0ec67f1cd..82d6930aa6 100644 --- a/inventory/group_vars/taskotron-stg +++ b/inventory/group_vars/taskotron-stg @@ -13,6 +13,8 @@ robots_path: /var/www/html # this enables extra repos during dnf install but that's broken right now, remember to re-enable extra_enablerepos: 'infrastructure-testing' +# make sure we're using the stg fedsmg bus +fedmsg_env: stg ############################################################ # task repo details @@ -29,6 +31,7 @@ grokmirror_repos: - { name: fedoraqa/rpmgrill, url: 'https://bitbucket.org/fedoraqa/task-rpmgrill.git'} - { name: fedoraqa/python-versions, url: 'https://github.com/fedora-python/task-python-versions'} - { name: fedoraqa/rpmdeplint, url: 'https://pagure.io/taskotron/task-rpmdeplint.git'} + - { name: fedoraqa/rpmlint-scratch, url: 'https://bitbucket.org/fedoraqa/task-rpmlint-scratch.git'} grokmirror_default_branch: develop @@ -45,10 +48,10 @@ resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb/ resultsdb_fe_endpoint: resultsdb taskotron_docs_url: https://qa.fedoraproject.org/docs/libtaskotron/latest/ - -trigger_distgit_repo_url: http://src.stg.fedoraproject.org/ +trigger_distgit_repo_url: http://pkgs.stg.fedoraproject.org/pagure/rpms/ trigger_critpath_url: https://admin.stg.fedoraproject.org/pkgdb/api/critpath?format=json + ############################################################ # taskotron details ############################################################ diff --git a/inventory/group_vars/taskotron-stg-client-hosts b/inventory/group_vars/taskotron-stg-client-hosts index f9f324b818..e319ca9560 100644 --- a/inventory/group_vars/taskotron-stg-client-hosts +++ b/inventory/group_vars/taskotron-stg-client-hosts @@ -41,8 +41,8 @@ execdb_external_url: https://taskotron.stg.fedoraproject.org/execdb/ resultsdb_server: http://resultsdb-stg01.qa.fedoraproject.org/resultsdb_api/api/v2.0/ # this should be proxy01.stg through /etc/hosts bodhi_server: http://bodhi.fedoraproject.org/ -kojihub_url: https://koji.fedoraproject.org/kojihub -kojipkg_url: https://kojipkgs.fedoraproject.org/packages +kojihub_url: https://koji.stg.fedoraproject.org/kojihub +kojipkg_url: https://kojipkgs.stg.fedoraproject.org/packages taskotron_master: https://taskotron.stg.fedoraproject.org/taskmaster/ resultsdb_external_url: https://taskotron.stg.fedoraproject.org/resultsdb artifacts_base_url: https://taskotron.stg.fedoraproject.org/artifacts diff --git a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 index d7c5575f0c..e3edd80526 100644 --- a/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 +++ b/roles/taskotron/taskotron-trigger/templates/trigger_rules.yml.j2 @@ -31,11 +31,14 @@ {% else %} - {tasks: [depcheck]} {% endif %} +{% if deployment_type not in ['dev', 'stg'] %} +{# stg bodhi doesn't have the info we need, stg koji doesn't have the builds from prod bodhi #} - when: message_type: KojiTagChanged tag: {$regex: '/.*(?