diff --git a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml index 2e5e122547..e333d1eec5 100644 --- a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml +++ b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml @@ -22,13 +22,22 @@ items: rpmdevtools \ fedora-messaging \ python3-bugzilla \ +{% if not env == 'staging' %} python3-dogpile-cache \ +{% endif %} python3-fedora \ +{% if not env == 'staging' %} python3-fedmsg \ +{% endif %} python3-koji \ +{% if not env == 'staging' %} python3-pycurl \ +{% endif %} python3-requests \ +{% if not env == 'staging' %} python3-six \ +{% endif %} + python3-requests \ python3-pip && \ dnf autoremove -y && \ dnf clean all -y diff --git a/roles/openshift-apps/the-new-hotness/templates/config.toml b/roles/openshift-apps/the-new-hotness/templates/config.toml index 6b79d5451e..fc8c939abb 100644 --- a/roles/openshift-apps/the-new-hotness/templates/config.toml +++ b/roles/openshift-apps/the-new-hotness/templates/config.toml @@ -13,7 +13,11 @@ topic_prefix = "org.fedoraproject.prod" {% endif %} passive_declares = true +{% if env == "staging" %} +callback = "hotness.hotness_consumer:HotnessConsumer" +{% else %} callback = "hotness.consumers:BugzillaTicketFiler" +{% endif %} # Note the double brackets below. # To add another binding, add another [[bindings]] section. @@ -22,7 +26,9 @@ queue = "the-new-hotness{{ env_suffix }}" exchange = "amq.topic" routing_keys = [ "org.release-monitoring.*.anitya.project.version.update", +{% if not env == "staging" %} "org.release-monitoring.*.anitya.project.map.new", +{% endif %} "org.fedoraproject.*.buildsys.task.state.change", ] @@ -87,8 +93,10 @@ read_timeout = 15 # The number of times the-new-hotness should retry a network request that # that failed for any reason (e.g. read timeout, DNS error, etc) requests_retries = 3 +{% if not env == "staging" %} # If true, publish fedmsg messages instead of fedora-messaging messages legacy_messaging = false +{% endif %} [consumer_config.bugzilla] enabled = true @@ -147,6 +155,7 @@ opts = {scratch = true} priority = 30 target_tag = "rawhide" +{% if not env == "staging" %} [consumer_config.anitya] url = "https://release-monitoring.org" @@ -154,3 +163,4 @@ url = "https://release-monitoring.org" backend = "dogpile.cache.dbm" expiration_time = 300 arguments = {filename = "/var/tmp/the-new-hotness-cache.dbm"} +{% endif %} \ No newline at end of file