Skip to content
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

Jump to bottom

[JENKINS-56290] Impossible to Add Streams with Exact Names to Multibranch Pipeline #93

Merged
merged 3 commits into from
Dec 18, 2019
Merged

[JENKINS-56290] Impossible to Add Streams with Exact Names to Multibranch Pipeline #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80bcece
Disable automatic adding of * to the end of streams paths
lystor Mar 5, 2019
2d8faae
Merge tag 'p4-1.9.7' into bug-56290
lystor Apr 24, 2019
dfd32f5
Merge tag 'p4-1.10.0' into bug-56290
lystor Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/main/java/org/jenkinsci/plugins/p4/client/ConnectionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,6 @@ private List<String> getDepotsForDirs() throws Exception {
* @throws Exception push up stack
*/
public List<IStreamSummary> getStreams(List<String> paths) throws Exception {
ListIterator<String> list = paths.listIterator();
while (list.hasNext()) {
String i = list.next();
if (!i.contains("...") && !i.contains("*")) {
list.set(i + "*");
}
}

GetStreamsOptions opts = new GetStreamsOptions();
List<IStreamSummary> streams = connection.getStreams(paths, opts);
return streams;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/org/jenkinsci/plugins/p4/scm/StreamsScmSource/help-includes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div>
<p>A List of Perforce depot paths to one or more Streams (separated by new lines). The plugin will recursively search for a
<code>Jenkinsfile</code> (or defined item) using the Stream name for the multi-branch name.</p>
<p><code>...</code> or <code>*</code> can be used as wildcards in Perforce depot paths.</p>
<p>For example: <code>//streams/...</code></p>
</div>