Skip to content

[1.7.x] Add skipVersionTest flag when doing Koji path mask repair #1210

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
jdcasey merged 1 commit into from
Apr 11, 2019
Merged

[1.7.x] Add skipVersionTest flag when doing Koji path mask repair #1210

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion .../koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,17 @@ public class KojiPathPatternFormatter
private final Logger logger = LoggerFactory.getLogger( getClass() );

public Set<String> getPatterns( ArtifactRef artifactRef, List<KojiArchiveInfo> archives )
{
return getPatterns( artifactRef, archives, false );
}

public Set<String> getPatterns( ArtifactRef artifactRef, List<KojiArchiveInfo> archives, boolean skipVersionTest )
{
Set<String> patterns = new HashSet<>();
for ( KojiArchiveInfo a : archives )
{
ArtifactRef ar = a.asArtifact();
if ( !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) )
if ( !skipVersionTest && !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) )
{
logger.warn(
"Cannot use Koji archive for path_mask_patterns: {}. Version '{}' is not allowed from Koji.", a,
Expand Down
2 changes: 1 addition & 1 deletion addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public KojiRepairResult repairPathMask( KojiRepairRequest request, String user,
}

// set pathMaskPatterns using build output paths
Set<String> patterns = kojiPathFormatter.getPatterns( artifactRef, archives );
Set<String> patterns = kojiPathFormatter.getPatterns( artifactRef, archives, true );
logger.debug( "For repo: {}, resetting path_mask_patterns to:\n\n{}\n\n", store.getKey(),
patterns );

Expand Down