diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index cb0469ffaa..e8aa8aef2b 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -196,42 +196,41 @@ handlers = ["console"] keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}" type = "modular" -# [[consumer_config.koji_instances.primary.tags]] -# from = "f35-signing-pending" -# to = "f35-updates-testing-pending" -# key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" -# keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" -# {% if env == "production" %} + [[consumer_config.koji_instances.primary.tags]] + from = "f35-signing-pending" + to = "f35-updates-testing-pending" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" + {% if env == "production" %} # ima file signing - disable for now per fesco # file_signing_key = "fedora-files-2021" -# {% endif %} + {% endif %} -# [consumer_config.koji_instances.primary.tags.sidetags] -# pattern = 'f35-build-side-' -# from = '-signing-pending' -# to = '-testing-pending' -# trusted_taggers = ['bodhi'] + [consumer_config.koji_instances.primary.tags.sidetags] + pattern = 'f35-build-side-' + from = '-signing-pending' + to = '-testing-pending' + trusted_taggers = ['bodhi'] -# [[consumer_config.koji_instances.primary.tags]] -# from = "f35-pending" -# to = "f35" -# key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" -# keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" + [[consumer_config.koji_instances.primary.tags]] + from = "f35-pending" + to = "f35" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" -# [[consumer_config.koji_instances.primary.tags]] -# from = "f35-modular-pending" -# to = "f35-modular" -# key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" -# keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" -# type = "modular" - -# [[consumer_config.koji_instances.primary.tags]] -# from = "f35-modular-updates-candidate" -# to = "f35-modular" -# key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" -# keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" -# type = "modular" + [[consumer_config.koji_instances.primary.tags]] + from = "f35-modular-pending" + to = "f35-modular" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" + type = "modular" + [[consumer_config.koji_instances.primary.tags]] + from = "f35-modular-updates-candidate" + to = "f35-modular" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" + type = "modular" [[consumer_config.koji_instances.primary.tags]] from = "f34-signing-pending"