Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 21 additions & 2 deletions src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,9 @@
discoverBranches(repository, walk, request, remoteReferences);
}
if (context.wantTags()) {
discoverTags(repository, walk, request, remoteReferences);
discoverTags(repository, walk, request, remoteReferences,
context.getAtLeastTagCommitTimeMillis(),
context.getAtMostTagCommitTimeMillis());
}
if (context.wantOtherRefs()) {
discoverOtherRefs(repository, walk, request, remoteReferences,
Expand Down Expand Up @@ -772,7 +774,9 @@

private void discoverTags(final Repository repository,
final RevWalk walk, GitSCMSourceRequest request,
Map<String, ObjectId> remoteReferences)
Map<String, ObjectId> remoteReferences,
long atLeastMillis,
long atMostMillis)
throws IOException, InterruptedException {
listener.getLogger().println("Checking tags...");
walk.setRetainBody(false);
Expand All @@ -785,6 +789,21 @@
final String tagName = StringUtils.removeStart(ref.getKey(), Constants.R_TAGS);
RevCommit commit = walk.parseCommit(ref.getValue());
final long lastModified = TimeUnit.SECONDS.toMillis(commit.getCommitTime());

if (atLeastMillis >= 0L || atMostMillis >= 0L) {

Check warning on line 793 in src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line

Line 793 is only partially covered, 2 branches are missing
if (atMostMillis >= 0L && atLeastMillis > atMostMillis) {
/* Invalid. It's impossible for any tag to satisfy this. */
continue;
}
long tagAge = System.currentTimeMillis() - lastModified;
if (atMostMillis >= 0L && tagAge > atMostMillis) {
continue;
}
if (atLeastMillis >= 0L && tagAge < atLeastMillis) {
continue;

Check warning on line 803 in src/main/java/jenkins/plugins/git/AbstractGitSCMSource.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines

Lines 794-803 are not covered by tests
}
}

if (request.process(new GitTagSCMHead(tagName, lastModified),
new SCMSourceRequest.IntermediateLambda<ObjectId>() {
@Nullable
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/jenkins/plugins/git/GitSCMSourceContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -95,6 +96,12 @@
@NonNull
private String remoteName = AbstractGitSCMSource.DEFAULT_REMOTE_NAME;

@CheckForNull
private long atLeastTagCommitTimeMillis;

@CheckForNull
private long atMostTagCommitTimeMillis;

/**
* Constructor.
*
Expand Down Expand Up @@ -192,6 +199,14 @@
return remoteName;
}

public final long getAtLeastTagCommitTimeMillis() {
return atLeastTagCommitTimeMillis;
}

public final long getAtMostTagCommitTimeMillis() {
return atMostTagCommitTimeMillis;
}

/**
* Adds a requirement for branch details to any {@link GitSCMSourceRequest} for this context.
*
Expand Down Expand Up @@ -358,6 +373,25 @@
return result;
}

private long getTagCommitTimeLimitMillisFromDays(String limitDays) {
long tagCommitTimeLimit = Long.parseLong(StringUtils.defaultIfBlank(limitDays, "-1"));
return tagCommitTimeLimit < 0 ? -1L : TimeUnit.DAYS.toMillis(tagCommitTimeLimit);

Check warning on line 378 in src/main/java/jenkins/plugins/git/GitSCMSourceContext.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line

Line 378 is only partially covered, one branch is missing
}

@SuppressWarnings("unchecked")
@NonNull
public final C withAtLeastTagCommitTimeDays(String atLeastDays) {
this.atLeastTagCommitTimeMillis = getTagCommitTimeLimitMillisFromDays(atLeastDays);
return (C) this;
}

@SuppressWarnings("unchecked")
@NonNull
public final C withAtMostTagCommitTimeDays(String atMostDays) {
this.atMostTagCommitTimeMillis = getTagCommitTimeLimitMillisFromDays(atMostDays);
return (C) this;
}

/**
* {@inheritDoc}
*/
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/jenkins/plugins/git/traits/TagDiscoveryTrait.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
package jenkins.plugins.git.traits;

import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import jenkins.plugins.git.GitSCMBuilder;
Expand Down Expand Up @@ -51,11 +52,20 @@
* @since 3.6.0
*/
public class TagDiscoveryTrait extends SCMSourceTrait {
private final String atLeastDays;
private final String atMostDays;

/**
* Constructor for stapler.
*/
@DataBoundConstructor
public TagDiscoveryTrait(@CheckForNull String atLeastDays, @CheckForNull String atMostDays) {
this.atLeastDays = atLeastDays;
this.atMostDays = atMostDays;
}

public TagDiscoveryTrait() {
this(null, null);
}

/**
Expand All @@ -66,6 +76,8 @@
GitSCMSourceContext<?,?> ctx = (GitSCMSourceContext<?, ?>) context;
ctx.wantTags(true);
ctx.withAuthority(new TagSCMHeadAuthority());
ctx.withAtLeastTagCommitTimeDays(atLeastDays)
.withAtMostTagCommitTimeDays(atMostDays);
}

/**
Expand All @@ -76,6 +88,14 @@
return category instanceof TagSCMHeadCategory;
}

public String getAtLeastDays() {
return atLeastDays;
}

public String getAtMostDays() {
return atMostDays;

Check warning on line 96 in src/main/java/jenkins/plugins/git/traits/TagDiscoveryTrait.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered lines

Lines 92-96 are not covered by tests
}

/**
* Our descriptor.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:c="/lib/credentials"
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry field="atLeastDays" title="${%Ignore tags newer than}">
<f:number default=""/>
</f:entry>
<f:entry field="atMostDays" title="${%Ignore tags older than}">
<f:number default="7"/>
</f:entry>
</j:jelly>