From f02e9dd5278377fb6a09a84fc638196464fdc7e2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 6 Sep 2022 08:32:46 -0700 Subject: [PATCH] update eln signing. This should have changed at branching, but didn't. ;( We also need to add in a entry for eln tagged builds to be signed and put back/kept in the eln tag. This will allow robosignatory to resign everything with the f38 keys. It can be removed after this. Signed-off-by: Kevin Fenzi --- .../templates/robosignatory.toml.j2 | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index 51d6aebe8a..769b54a214 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -408,26 +408,33 @@ handlers = ["console"] [[consumer_config.koji_instances.primary.tags]] from = "eln-signing-pending" to = "eln-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" - file_signing_key = "fedora-37-ima" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}" + file_signing_key = "fedora-38-ima" [[consumer_config.koji_instances.primary.tags]] from = "eln-modular-updates-candidate" to = "eln-modular" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}" type = "modular" - file_signing_key = "fedora-37-ima" + file_signing_key = "fedora-38-ima" # ELN Mass Rebuild [[consumer_config.koji_instances.primary.tags]] from = "eln-rebuild" to = "eln-rebuild" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" - file_signing_key = "fedora-37-ima" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}" + file_signing_key = "fedora-38-ima" + + [[consumer_config.koji_instances.primary.tags]] + from = "eln" + to = "eln" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('eb10b464', 'd300e724') }}" + file_signing_key = "fedora-38-ima" # ELN Side tags @@ -436,7 +443,7 @@ handlers = ["console"] from = '-signing-pending' to = '-testing-pending' trusted_taggers = ['bodhi'] - file_signing_key = "fedora-37-ima" + file_signing_key = "fedora-38-ima" # openh264 signing