Skip to content

Generalize retrieval of source RPM from the Testing Farm URL #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkoncek merged 1 commit into from
Jun 25, 2026
Merged

Generalize retrieval of source RPM from the Testing Farm URL #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions src/main/java/org/fedoraproject/javapackages/validator/MainTmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ public class MainTmt extends Main {
private Optional<URI> TESTING_FARM_GIT_URL = Optional.empty();
private Map<String, List<LogEntry>> additionalLogs = new TreeMap<>();

private static final Pattern URL_PACKAGE_NAME_PATTERN = Pattern.compile(".*/rpms/(.*)");

private static String getenv(String key) {
var result = System.getenv(key);
if (result == null) {
Expand Down Expand Up @@ -225,15 +223,27 @@ protected Map<String, Validator> select(Map<String, Validator> validators) throw
@Override
protected Iterable<RpmPackage> findRpms() throws Exception {
logger.debug("TESTING_FARM_GIT_URL: {0}", Decorated.plain(TESTING_FARM_GIT_URL.map(String::valueOf).orElse("")));
var packageName = TESTING_FARM_GIT_URL.map(uri -> {
var uriPath = uri.getPath();
var begin = uriPath.lastIndexOf('/');
if (begin == -1) {
begin = 0;
}
var end = uriPath.length();
if (uriPath.endsWith(".git")) {
end -= 4;
}
return uriPath.substring(begin, end);
});
packageName.ifPresent(name -> {
logger.debug("Tested source package: {0}", Decorated.plain(name));
});
var rpms = new ArrayList<RpmPackage>();
var it = ArgFileIterator.create(parameters.argPaths);
while (it.hasNext()) {
var rpm = it.next();
if (TESTING_FARM_GIT_URL.isPresent()) {
var matcher = URL_PACKAGE_NAME_PATTERN.matcher(TESTING_FARM_GIT_URL.get().getPath());
if (matcher.matches() && !matcher.group(1).equals(rpm.getInfo().getSourceName())) {
continue;
}
if (packageName.isPresent() && packageName.get().equals(rpm.getInfo().getSourceName())) {
continue;
}
rpms.add(rpm);
}
Expand Down