From 08a1fa83f4c5fc89f127ac3b10912e9fc1e1d23b Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Feb 09 2022 11:42:32 +0000 Subject: Use prepopulate.json from the merge request. Signed-off-by: Jan Kaluza --- diff --git a/cccc/cli.py b/cccc/cli.py index 87d8832..a2ff8c9 100644 --- a/cccc/cli.py +++ b/cccc/cli.py @@ -137,6 +137,8 @@ def _merge_updated_config(conf, args, merged_dir, scratch_dir): p.skip_phases(args.skip_phases) # Override variants_file so it points to updated variants_files. p.set_variants_file(conf["variants_file"]) + # Override prepopulate so it points to updated file. + p.set_prepopulate_file(conf["prepopulate_file"]) p.disable_cts() # write the updated pungi config file with the file name expected by ODCS diff --git a/cccc/config.py b/cccc/config.py index cd532ba..6d71d77 100644 --- a/cccc/config.py +++ b/cccc/config.py @@ -24,6 +24,7 @@ _DefaultConfig = { "bugzilla_product": "", "bugzilla_api_key_file": "", "variants_file": "variants.xml", + "prepopulate_file": "prepopulate.json", } _RHELConfiguration = { diff --git a/cccc/pungi.py b/cccc/pungi.py index e1a2e28..3b4ead7 100644 --- a/cccc/pungi.py +++ b/cccc/pungi.py @@ -179,3 +179,11 @@ class PungiConfig(object): :return: None """ self.conf["variants_file"] = variants_file + + def set_prepopulate_file(self, prepopulate_file): + """ + Sets the `prepopulate_file` configuration option. + + :return: None + """ + self.conf["gather_prepopulate"] = prepopulate_file