From 6949a0ca7124987aa6c5cb458b7b49b0c5feec52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 30 Jul 2024 11:01:03 +0200
Subject: [PATCH] Update poddlers with the changes in toddlers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 .../poddlers/templates/fedora-messaging.toml  | 24 ++++------
 vars/apps/poddlers.yml                        | 44 +++++++++----------
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/roles/openshift-apps/poddlers/templates/fedora-messaging.toml b/roles/openshift-apps/poddlers/templates/fedora-messaging.toml
index ed8e70474f..afc9705a43 100644
--- a/roles/openshift-apps/poddlers/templates/fedora-messaging.toml
+++ b/roles/openshift-apps/poddlers/templates/fedora-messaging.toml
@@ -44,12 +44,13 @@ routing_keys = {{ toddler.topics|tojson }}
 # more of them.
 blocked_toddlers = [
     "debug",
-    # Block pdc_modules toddler – MBS is retired. Can be removed once toddler has been updated to a
-    # version which doesn’t come with pdc_modules.
-    "pdc_modules",
-{% if env != "staging" %}
     "distgit_commit_processor",
-{% endif %}
+    "koji_block_retired",
+    # Block all the PDC related toddlers
+    "pdc_import_compose",
+    "pdc_unretire_packages",
+    "distgit_bugzilla_sync",
+    "pdc_update_critpath"
 ]
 
 [consumer_config.default]
@@ -114,6 +115,9 @@ koji_url = "https://koji{{ env_suffix }}.fedoraproject.org"
 # Base URL for the Koji package db
 kojipkgs_url = "https://kojipkgs{{ env_suffix }}.fedoraproject.org"
 
+# Base URL for Bodhi
+bodhi_url = "https://bodhi{{ env_suffix }}.fedoraproject.org"
+
 # Account to use to connect to Pagure-as-dist-git
 dist_git_url = "https://src{{ env_suffix }}.fedoraproject.org"
 {% if env == "staging" %}
@@ -206,16 +210,6 @@ versions = []
 branch_regex = '^epel\d+$'
 versions = ["epel9", "epel8"]
 
-[consumer_config.koji_block_retired]
-# Set correct koji profile for corresponding koji ClientSession
-{% if env == "staging" %}
-profile = "stg"
-{% else %}
-profile = "koji"
-{% endif %}
-principal = "{{service}}/{{host}}"
-keytab = "/etc/keytabs/service.keytab"
-
 # Configuration section for scm_request_processor
 [consumer_config.scm_request_processor]
 # Monitoring choices for release-monitoring.org
diff --git a/vars/apps/poddlers.yml b/vars/apps/poddlers.yml
index cedcabeecf..03dfc355c2 100644
--- a/vars/apps/poddlers.yml
+++ b/vars/apps/poddlers.yml
@@ -15,10 +15,10 @@ poddlers_toddlers:
     topics:
       - "org.fedoraproject.*.toddlers.trigger.clean_retired_packages"
 
-  - name: distgit-bugzilla-sync
-    callback: distgit_bugzilla_sync:DistgitBugzillaSync
-    topics:
-      - "org.fedoraproject.*.toddlers.trigger.distgit_bugzilla_sync"
+  # - name: distgit-bugzilla-sync
+  #   callback: distgit_bugzilla_sync:DistgitBugzillaSync
+  #   topics:
+  #     - "org.fedoraproject.*.toddlers.trigger.distgit_bugzilla_sync"
 
   - name: distgit-commit-processor
     callback: distgit_commit_processor:DistGitCommitProcessor
@@ -37,10 +37,10 @@ poddlers_toddlers:
     topics:
       - "org.fedoraproject.*.buildsys.build.state.change"
 
-  - name: koji-block-retired
-    callback: koji_block_retired:KojiBlockRetired
-    topics:
-      - "org.fedoraproject.*.git.receive"
+  # - name: koji-block-retired
+  #   callback: koji_block_retired:KojiBlockRetired
+  #   topics:
+  #     - "org.fedoraproject.*.git.receive"
 
   - name: packager-bugzilla-sync
     callback: packager_bugzilla_sync:PackagerBugzillaSync
@@ -52,21 +52,21 @@ poddlers_toddlers:
     topics:
       - "org.fedoraproject.*.toddlers.trigger.packagers_without_bugzilla"
 
-  - name: pdc-import-compose
-    callback: pdc_import_compose:PDCImportCompose
-    topics:
-      - "org.fedoraproject.*.toddlers.trigger.pdc_import_compose"
-      - "org.fedoraproject.*.pungi.compose.status.change"
+  # - name: pdc-import-compose
+  #   callback: pdc_import_compose:PDCImportCompose
+  #   topics:
+  #     - "org.fedoraproject.*.toddlers.trigger.pdc_import_compose"
+  #     - "org.fedoraproject.*.pungi.compose.status.change"
 
-  - name: pdc-unretire-packages
-    callback: pdc_unretire_packages:PDCUnretirePackages
-    topics:
-      - "io.pagure.*.pagure.issue.new"
+  # - name: pdc-unretire-packages
+  #   callback: pdc_unretire_packages:PDCUnretirePackages
+  #   topics:
+  #     - "io.pagure.*.pagure.issue.new"
 
-  - name: pdc-update-critpath
-    callback: pdc_update_critpath:PDCUpdateCritpath
-    topics:
-      - "org.fedoraproject.*.toddlers.trigger.pdc_update_critpath"
+  # - name: pdc-update-critpath
+  #   callback: pdc_update_critpath:PDCUpdateCritpath
+  #   topics:
+  #     - "org.fedoraproject.*.toddlers.trigger.pdc_update_critpath"
 
   - name: scm-request-processor
     callback: scm_request_processor:SCMRequestProcessor
@@ -92,7 +92,6 @@ poddlers_cronjobs:
     command: check_email_overrides
   - name: clean-retired-packages
     schedule: "0 8 1 * *"
-    only_env: production
     command: clean_retired_packages
   - name: packagers-without-bugzilla
     schedule: "0 7 * * *"
@@ -108,4 +107,5 @@ poddlers_cronjobs:
     command: check-commit-rights
   - name: pagure-fas-groups-sync
     schedule: "0 4 * * *"
+    only_env: staging
     command: pagure_fas_groups_sync