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.
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-54078] JEP-210 compatibility #74
Changes from 1 commit
2ad8c70
11c9999
746f455
f66bb29
128f7d2
5d8c464
0918918
46433e1
3af06c9
066e961
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,7 @@ | |
<parent> | ||
<groupId>org.jenkins-ci.plugins</groupId> | ||
<artifactId>plugin</artifactId> | ||
<version>3.19</version> | ||
<version>3.25</version> | ||
<relativePath /> | ||
</parent> | ||
<groupId>org.jenkins-ci.plugins.workflow</groupId> | ||
|
@@ -67,9 +67,9 @@ | |
<jenkins.version>2.121.1</jenkins.version> | ||
<java.level>8</java.level> | ||
<workflow-step-api-plugin.version>2.15</workflow-step-api-plugin.version> | ||
<workflow-cps-plugin.version>2.32</workflow-cps-plugin.version> | ||
<workflow-support-plugin.version>2.14</workflow-support-plugin.version> | ||
<workflow-api-plugin.version>2.28</workflow-api-plugin.version> | ||
<workflow-cps-plugin.version>2.58-beta-1</workflow-cps-plugin.version> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These can be updated to non-beta versions now. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remind me to do so once jenkinsci/workflow-durable-task-step-plugin#75 is in a release. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, if that PR isn't released by next Friday I will release it and ping you then. |
||
<workflow-support-plugin.version>2.21-beta-1</workflow-support-plugin.version> | ||
<workflow-api-plugin.version>2.30-beta-1</workflow-api-plugin.version> | ||
<useBeta>true</useBeta> | ||
</properties> | ||
<dependencies> | ||
|
@@ -98,7 +98,7 @@ | |
<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</groupId> | ||
|
@@ -121,13 +121,13 @@ | |
<dependency> | ||
<groupId>org.jenkins-ci.plugins.workflow</groupId> | ||
<artifactId>workflow-job</artifactId> | ||
<version>2.10</version> | ||
<version>2.26-beta-1</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.jenkins-ci.plugins.workflow</groupId> | ||
<artifactId>workflow-durable-task-step</artifactId> | ||
<version>2.3</version> | ||
<version>2.22-rc713.c51e25cf0eef</version> <!-- TODO https://github.com/jenkinsci/workflow-durable-task-step-plugin/pull/75 --> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. jenkinsci/workflow-durable-task-step-plugin#75, to get Note that this build is actually older than the 2.22 on the update center, but it does contain jenkinsci/workflow-durable-task-step-plugin#63 and the subsequent commits are uninteresting. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Released as workflow-durable-task-step 2.24. |
||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
|
@@ -182,7 +182,7 @@ | |
<dependency> | ||
<groupId>org.jenkins-ci.plugins</groupId> | ||
<artifactId>script-security</artifactId> | ||
<version>1.28</version> | ||
<version>1.46</version> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
|
@@ -205,4 +205,13 @@ | |
<scope>test</scope> | ||
</dependency> | ||
</dependencies> | ||
<dependencyManagement> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.jenkins-ci.plugins</groupId> | ||
<artifactId>scm-api</artifactId> | ||
<version>2.2.6</version> | ||
</dependency> | ||
</dependencies> | ||
</dependencyManagement> | ||
</project> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
|
||
package org.jenkinsci.plugins.workflow.steps; | ||
|
||
import hudson.Functions; | ||
import hudson.model.Result; | ||
import hudson.model.TaskListener; | ||
import hudson.model.listeners.RunListener; | ||
|
@@ -43,6 +44,7 @@ | |
import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep; | ||
import org.junit.*; | ||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assume.*; | ||
import org.junit.runners.model.Statement; | ||
import org.jvnet.hudson.test.BuildWatcher; | ||
import org.jvnet.hudson.test.Issue; | ||
|
@@ -239,6 +241,24 @@ public void evaluate() throws Throwable { | |
}); | ||
} | ||
|
||
@Test | ||
public void activityRemote() { | ||
assumeFalse(Functions.isWindows()); // TODO create analogue using bat | ||
story.then(r -> { | ||
r.createSlave(); | ||
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p"); | ||
p.setDefinition(new CpsFlowDefinition("" + | ||
"node('!master') {\n" + | ||
" timeout(time:5, unit:'SECONDS', activity: true) {\n" + | ||
" sh 'set +x; echo NotHere; sleep 3; echo NotHereYet; sleep 3; echo JustHere; sleep 10; echo ShouldNot'\n" + | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Cannot use |
||
" }\n" + | ||
"}\n", true)); | ||
WorkflowRun b = r.assertBuildStatus(Result.ABORTED, p.scheduleBuild2(0)); | ||
story.j.assertLogContains("JustHere", b); | ||
story.j.assertLogNotContains("ShouldNot", b); | ||
}); | ||
} | ||
|
||
@Issue("JENKINS-26163") | ||
@Test | ||
public void restarted() throws Exception { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Various changes to pick up JEP-210 binaries.