From 03e38ad87c882d62ce9f54709fcf8c535edc36fa Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Mon, 29 Dec 2014 18:24:49 +0200 Subject: gbp rpm: mock chroot builder Initial version. Very rough and many shortcuts taken. Try: gbp buildpackage-rpm --git-mock --git-dist=epel-6 Results will be under ../rpmbuild/results/ --- gbp/scripts/buildpackage_rpm.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'gbp/scripts/buildpackage_rpm.py') diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index dcfa3ac..c29a83f 100644 --- a/gbp/scripts/buildpackage_rpm.py +++ b/gbp/scripts/buildpackage_rpm.py @@ -293,7 +293,7 @@ def is_native(repo, options): def setup_builder(options, builder_args): - """setup everything to use git-pbuilder""" + """setup everything pathes for rpmbuild""" if options.builder.startswith('rpmbuild'): if len(builder_args) == 0: builder_args.append('-ba') @@ -310,6 +310,23 @@ def setup_builder(options, builder_args): options.spec_dir = '' +def setup_mock(options): + """setup everything to use git-mock""" + if options.use_mock: + options.builder = 'git-mock' + options.cleaner = '/bin/true' + os.environ['DIST'] = options.mock_dist + if options.mock_arch: + os.environ['ARCH'] = options.mock_arch + if options.mock_root: + os.environ['GIT_MOCK_ROOT'] = options.mock_root + os.environ['GIT_MOCK_EXPORT_DIR'] = options.export_dir + # FIXME: get that option defined: + #os.environ['GIT_MOCK_RESULTS_PAT'] = options.mock_results_pat + if options.mock_options: + os.environ['GIT_MOCK_OPTIONS'] = options.mock_options + + def update_tag_str_fields(fields, tag_format_str, repo, commit_info): """Update string format fields for packaging tag""" fields['nowtime'] = datetime.now().strftime(RpmPkgPolicy.tag_timestamp_format) @@ -447,6 +464,12 @@ def parse_args(argv, prefix, git_treeish=None): help="hook run after a successful build, default is '%(postbuild)s'") cmd_group.add_config_file_option(option_name="posttag", dest="posttag", help="hook run after a successful tag operation, default is '%(posttag)s'") + cmd_group.add_boolean_config_file_option(option_name="mock", dest="use_mock") + #cmd_group.add_config_file_option(option_name="mock-results-pat", dest="mock_results_pat") + cmd_group.add_config_file_option(option_name="dist", dest="mock_dist") + cmd_group.add_config_file_option(option_name="arch", dest="mock_arch") + cmd_group.add_config_file_option(option_name="mock-root", dest="mock_root") + cmd_group.add_config_file_option(option_name="mock-options", dest="mock_options") cmd_group.add_boolean_config_file_option(option_name="hooks", dest="hooks") export_group.add_option("--git-no-build", action="store_true", dest="no_build", @@ -568,6 +591,7 @@ def main(argv): if not options.tag_only: # Setup builder opts setup_builder(options, builder_args) + setup_mock(options) # Generate patches, if requested if options.patch_export and not is_native(repo, options): -- cgit v1.2.3