From 1774559f3acaa54a29473b01129fa01932c26e52 Mon Sep 17 00:00:00 2001 From: Ondrej Nosek Date: Apr 15 2019 08:24:08 +0000 Subject: Pass --enable-network to mock Mockbuild: pass --enable-network to mock command. JIRA: COMPOSE-3371 Fixes: https://pagure.io/fedpkg/issue/314 Signed-off-by: Ondrej Nosek --- diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py index 63e60b4..400ebd1 100644 --- a/pyrpkg/cli.py +++ b/pyrpkg/cli.py @@ -1090,6 +1090,8 @@ defined, packages will be built sequentially.""" % {'name': self.name}) mockbuild_parser.add_argument( '--disablerepo', action='append', help='Pass disablerepo option to yum/dnf (may be used more than once)') + mockbuild_parser.add_argument( + '--enable-network', action='store_true', help='Enable networking') mockbuild_parser.set_defaults(command=self.mockbuild) def register_mock_config(self): @@ -2082,6 +2084,9 @@ see API KEY section of copr-cli(1) man page. for repo_value in self.args.disablerepo: mockargs.extend(['--disablerepo', repo_value]) + if self.args.enable_network: + mockargs.append('--enable-network') + # Pick up any mockargs from the env try: mockargs += os.environ['MOCKARGS'].split() diff --git a/tests/test_cli.py b/tests/test_cli.py index 7274e2c..785e103 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1454,12 +1454,14 @@ class TestMockbuild(CliTestCase): '--release', 'rhel-6', 'mockbuild', '--root', '/etc/mock/some-root', '--enablerepo', 'FAVOURITE_REPO', '--disablerepo', 'UNWANTED_REPO', - '--enablerepo', 'ANOTHER_FAVOURITE_REPO'] + '--enablerepo', 'ANOTHER_FAVOURITE_REPO', + '--enable-network'] cli = self.mockbuild(cli_cmd) expected_cmd = ['mock', '--enablerepo', 'FAVOURITE_REPO', '--enablerepo', 'ANOTHER_FAVOURITE_REPO', '--disablerepo', 'UNWANTED_REPO', + '--enable-network', '-r', '/etc/mock/some-root', '--resultdir', cli.cmd.mock_results_dir, '--rebuild', cli.cmd.srpmname]