PR#2125: mirrormanager: update EPEL regexes for EPEL 10 - fedora-infra/ansible

fedora-infra / ansible

#2125 mirrormanager: update EPEL regexes for EPEL 10

Merged 9 months ago by zlopez. Opened 9 months ago by carlwgeorge.

fedora-infra/ carlwgeorge/ansible mirrormanager-epel10-scan into main

mirrormanager: update EPEL regexes for EPEL 10

Carl George • 9 months ago

6105360

roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml

file modified

+2 -2

		`@@ -21,11 +21,11 @@`
		`url="/srv/pub/epel/"`

		`[[repository_mapping]]`
		`- regex="pub/epel/testing/[\\d]/[^M].*"`
		`+ regex="^pub/epel/testing/\\d+(?:\\.\\d+)?/Everything/"`
zlopez commented 9 months ago I'm not sure if the `^` will work, as the url doesn't start with `pub`
carlwgeorge commented 9 months ago Most of other regexes in this file start with `^`, so I was trying to lean towards consistency while updating these regexes. I can certainly drop that character if it does cause problems, but it seems to be working fine with the other mappings.
		`prefix="testing-epel"`

		`[[repository_mapping]]`
		`- regex="pub/epel/[\\d]/[^M].*"`
		`+ regex="^pub/epel/\\d+(?:\\.\\d+)?/Everything/"`
		`prefix="epel"`

		`[[repository_mapping]]`

carlwgeorge commented 9 months ago

Previously these regexes only matched a single digit for EPEL paths. This changes them to match multiple digits, and also to optionally match a minor version.

zuul commented 9 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/53d1b85fcc42403cbd0176053d28eebd

fi-ansible-lint-diff : SUCCESS in 4m 15s
fi-yamllint-diff : SUCCESS in 2m 53s

zlopez commented on line 6 of roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml 9 months ago

I'm not sure if the ^ will work, as the url doesn't start with pub

carlwgeorge commented on line 6 of roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml 9 months ago

Most of other regexes in this file start with ^, so I was trying to lean towards consistency while updating these regexes. I can certainly drop that character if it does cause problems, but it seems to be working fine with the other mappings.

rebased onto e41d292

9 months ago

zuul commented 9 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/285e3dae0447463c947e10cf5764e041