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

[JENKINS-2111] Integration test of new workspace naming strategy #82

Merged
merged 12 commits into from
Nov 9, 2018
Merged

[JENKINS-2111] Integration test of new workspace naming strategy #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0c3719d
[JENKINS-26143] Tests
daniel-beck Mar 11, 2018
d998521
Newer snapshot with reverted prototype in core
daniel-beck Mar 12, 2018
82fd9e0
Merge branch 'JENKINS-26143' of https://github.com/daniel-beck/workfl…
jglick Oct 5, 2018
b0356fd
Making this buildable.
jglick Oct 5, 2018
518338c
This plugin has long had a 2.x baseline so there was no reason to hav…
jglick Oct 5, 2018
3209933
1.17 released, so may as well use that now.
jglick Oct 5, 2018
af95c21
Disabling Windows tests until https://github.com/jenkinsci/branch-api…
jglick Oct 5, 2018
0a9d89e
[JENKINS-2111] Integration test of new workspace naming strategy.
jglick Oct 5, 2018
1d05418
Seeing if https://github.com/jenkinsci/jenkins-test-harness/pull/113 …
jglick Oct 5, 2018
fb06e26
Another fix relating to file locks.
jglick Oct 5, 2018
0135426
https://github.com/jenkinsci/jenkins-test-harness/pull/113 is now in …
jglick Oct 5, 2018
8546dc0
https://github.com/jenkinsci/branch-api-plugin/pull/129 was released.
jglick Nov 9, 2018
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: 7 additions & 0 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.0-beta-7</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-Pconsume-incrementals
-Pmight-produce-incrementals
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buildPlugin(jenkinsVersions: [null, '2.89.2'])
buildPlugin()
26 changes: 11 additions & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>3.2</version>
<version>3.25</version>
<relativePath />
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>2.21-SNAPSHOT</version>
<version>${revision}${changelist}</version>
<packaging>hpi</packaging>
<name>Pipeline: Multibranch</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Multibranch+Plugin</url>
<url>https://wiki.jenkins.io/display/JENKINS/Pipeline+Multibranch+Plugin</url>
<description>Enhances Pipeline plugin to handle branches better by automatically grouping builds from different branches</description>
<licenses>
<license>
Expand All @@ -48,7 +48,7 @@ THE SOFTWARE.
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
<tag>${scmTag}</tag>
</scm>
<repositories>
<repository>
Expand All @@ -63,9 +63,11 @@ THE SOFTWARE.
</pluginRepository>
</pluginRepositories>
<properties>
<revision>2.21</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.62</jenkins.version>
<scm-api.version>2.2.6</scm-api.version>
<jenkins.version>2.121.1</jenkins.version>
<scm-api.version>2.2.7</scm-api.version>
<no-test-jar>false</no-test-jar>
<workflow-step-api.version>2.13</workflow-step-api.version>
<workflow-scm-step-plugin.version>2.4</workflow-scm-step-plugin.version>
Expand All @@ -92,7 +94,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.14</version>
<version>1.17</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -107,13 +109,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.18</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
<version>2.0.21</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -262,7 +258,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>2.3</version>
<version>2.4</version>
<scope>test</scope><!-- from git-server via workflow-cps-global-lib and otherwise unavailable during tests -->
</dependency>
<dependency>
Expand Down
Loading