Bug 1391680 - Make mar signature passed by release_runner (#265)

* Bug 1391680 - Make mar signature passed by release_runner * Fix tests * Fix test part 2
mozilla-releng · Aug 18, 2017 · dc89be7 · dc89be7
1 parent 0afeb31
commit dc89be7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/releasetasks/templates/desktop/enUS.yml.tmpl b/releasetasks/templates/desktop/enUS.yml.tmpl
@@ -222,7 +222,7 @@
         scopes:
             - project:releng:signing:cert:{{ signing_class }}
             - project:releng:signing:format:gpg
-            - project:releng:signing:format:mar
+            - project:releng:signing:format:{{ mar_signing_format }}
         tags:
             createdForUser: release+funsize@mozilla.com
 

diff --git a/releasetasks/templates/desktop/l10n.yml.tmpl b/releasetasks/templates/desktop/l10n.yml.tmpl
@@ -296,7 +296,7 @@
         scopes:
             - project:releng:signing:cert:{{ signing_class }}
             - project:releng:signing:format:gpg
-            - project:releng:signing:format:mar
+            - project:releng:signing:format:{{ mar_signing_format }}
         tags:
             createdForUser: release+funsize@mozilla.com
 

diff --git a/releasetasks/templates/desktop/release_graph.yml.tmpl b/releasetasks/templates/desktop/release_graph.yml.tmpl
@@ -44,7 +44,7 @@ scopes:
   - queue:*
   - docker-worker:*
   - scheduler:*
-  - project:releng:signing:format:mar
+  - project:releng:signing:format:{{ mar_signing_format }}
 {# dep signing uses Balrog dev environment, which is publicly available and
    this doesn't need to use the proxy
 #}

diff --git a/releasetasks/test/desktop/default_graph_parameters.yml b/releasetasks/test/desktop/default_graph_parameters.yml
@@ -12,6 +12,7 @@ balrog_api_root: https://balrog.real/api
 funsize_balrog_api_root: http://balrog/api
 signing_class: release-signing
 signing_cert: dep
+mar_signing_format: mar_sha384
 root_home_dir: desktop
 tuxedo_server_url: https://bouncer.real.allizom.org/api
 verifyConfigs: {}

diff --git a/releasetasks/test/desktop/test_partials.py b/releasetasks/test/desktop/test_partials.py
@@ -16,7 +16,7 @@ def setUp(self):
                 "docker-worker:*",
                 "scheduler:*",
                 "project:releng:signing:format:gpg",
-                "project:releng:signing:format:mar",
+                "project:releng:signing:format:mar_sha384",
                 "project:releng:signing:cert:release-signing",
                 "docker-worker:feature:balrogVPNProxy"
             })
@@ -46,6 +46,7 @@ def setUp(self):
                     },
                 }
             },
+            'mar_signing_format': 'mar_sha384',
         })
         self.graph = make_task_graph(**test_kwargs)
         self.generator_image = get_task_by_name(self.graph, "funsize_update_generator_image")
@@ -89,7 +90,7 @@ def test_generator_signing_balrog_tasks(self):
                         },
                         'scopes': [
                             "project:releng:signing:cert:release-signing",
-                            "project:releng:signing:format:mar",
+                            "project:releng:signing:format:mar_sha384",
                             "project:releng:signing:format:gpg",
                         ],
                     },