PR#1067: Fix default Fedora distgit url - fm-orchestrator

fm-orchestrator

#1067 Fix default Fedora distgit url

Closed 5 years ago by cqi. Opened 5 years ago by cqi.

cqi/fm-orchestrator fix-default-distgit-url into master

Fix default Fedora distgit url

Chenxiong Qi • 5 years ago

8cabb22

conf/config.py

file modified

+3 -3

		`@@ -36,7 +36,7 @@`
		`PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'`
		`PDC_INSECURE = False`
		`PDC_DEVELOP = True`
		`- SCMURLS = ["git://pkgs.fedoraproject.org/modules/"]`
		`+ SCMURLS = ["https://src.fedoraproject.org/modules/"]`
		`YAML_SUBMIT_ALLOWED = False`

		`# How often should we resort to polling, in seconds`
		`@@ -49,12 +49,12 @@`

		`ALLOW_CUSTOM_SCMURLS = False`

		`- RPMS_DEFAULT_REPOSITORY = 'git://pkgs.fedoraproject.org/rpms/'`
		`+ RPMS_DEFAULT_REPOSITORY = 'https://src.fedoraproject.org/rpms/'`
csomh commented 5 years ago I'm not sure if this will work with koji, as `https` is not considered a valid scheme for SCMs, see https://pagure.io/koji/blob/master/f/koji/daemon.py#_174
		`RPMS_ALLOW_REPOSITORY = False`
		`RPMS_DEFAULT_CACHE = 'http://pkgs.fedoraproject.org/repo/pkgs/'`
		`RPMS_ALLOW_CACHE = False`

		`- MODULES_DEFAULT_REPOSITORY = 'git://pkgs.fedoraproject.org/modules/'`
		`+ MODULES_DEFAULT_REPOSITORY = 'https://src.fedoraproject.org/modules/'`
		`MODULES_ALLOW_REPOSITORY = False`

		`ALLOWED_GROUPS = set([`

module_build_service/config.py

file modified

+2 -2

		`@@ -221,7 +221,7 @@`
		`'desc': 'Allow custom scmurls.'},`
		`'rpms_default_repository': {`
		`'type': str,`
		`- 'default': 'git://pkgs.fedoraproject.org/rpms/',`
		`+ 'default': 'https://src.fedoraproject.org/rpms/',`
		`'desc': 'RPMs default repository URL.'},`
		`'rpms_allow_repository': {`
		`'type': bool,`
		`@@ -237,7 +237,7 @@`
		`'desc': 'Allow custom RPMs cache.'},`
		`'modules_default_repository': {`
		`'type': str,`
		`- 'default': 'git://pkgs.fedoraproject.org/modules/',`
		`+ 'default': 'https://src.fedoraproject.org/modules/',`
		`'desc': 'Included modules default repository URL.'},`
		`'modules_allow_repository': {`
		`'type': bool,`

cqi commented 5 years ago

During running local build with Fedora infra services, the original
default distgit urls are not available, which causes command `git
ls-remote' and cloning modules from distgit fail.

Signed-off-by: Chenxiong Qi cqi@redhat.com

csomh commented on line 15 of conf/config.py 5 years ago

I'm not sure if this will work with koji, as https is not considered a valid scheme for SCMs, see https://pagure.io/koji/blob/master/f/koji/daemon.py#_174