Skip to content
Permalink
Browse files

Merge pull request #296 from recena/JENKINS-31153

[JENKINS-31153] Rename Workflow to Pipeline
Originally-Committed-As: 118b89e1b1828a39f50fb955942ffcbbe69e653e
  • Loading branch information
jglick committed Jan 15, 2016
2 parents 313a7aa + b2ba8b2 commit bd2d1662356531a50841beadfabb2ef9a84cfd0f
@@ -148,14 +148,14 @@ public void testRetry() throws Exception {

idx = 0;
for (String msg : new String[] {
"[Workflow] Retry the body up to N times : Start",
"[Workflow] retry {",
"[Workflow] } //retry",
"[Workflow] retry {",
"[Workflow] } //retry",
"[Workflow] retry {",
"[Workflow] } //retry",
"[Workflow] Retry the body up to N times : End",
"[Pipeline] Retry the body up to N times : Start",
"[Pipeline] retry {",
"[Pipeline] } //retry",
"[Pipeline] retry {",
"[Pipeline] } //retry",
"[Pipeline] retry {",
"[Pipeline] } //retry",
"[Pipeline] Retry the body up to N times : End",
}) {
idx = log.indexOf(msg, idx + 1);
assertTrue(msg + " not found", idx != -1);
@@ -1,7 +1,7 @@
{
"name": "workflow-ui",
"version": "1.0.0",
"description": "Jenkins Workflow UI",
"description": "Jenkins Pipeline UI",
"author": "Tom Fennelly <tom.fennelly@gmail.com> (https://github.com/tfennelly)",
"license": "MIT",
"repository": {
@@ -32,7 +32,7 @@
</parent>
<artifactId>workflow-cps</artifactId>
<packaging>hpi</packaging>
<name>Workflow: Groovy CPS Execution</name>
<name>Pipeline: Groovy CPS Execution</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Workflow+Plugin</url>
<dependencies>
<dependency>
@@ -123,7 +123,7 @@ public CpsFlowExecution create(FlowExecutionOwner owner, TaskListener listener,

@Override
public String getDisplayName() {
return "Workflow script";
return "Pipeline script";
}

public FormValidation doCheckScript(@QueryParameter String value, @QueryParameter boolean sandbox) {
@@ -136,7 +136,7 @@ private String getFilePathSuffix() {
@Inject public Snippetizer snippetizer;

@Override public String getDisplayName() {
return "Workflow script from SCM";
return "Pipeline script from SCM";
}

public Collection<? extends SCMDescriptor<?>> getApplicableDescriptors() {
@@ -237,7 +237,7 @@ public HttpResponse doGenerateSnippet(StaplerRequest req, @QueryParameter String
public void doStatic(StaplerRequest req, StaplerResponse rsp) throws Exception {
rsp.setContentType("text/html;charset=UTF-8");
PrintWriter pw = rsp.getWriter();
pw.println("<html><head><title>Jenkins Workflow Reference</title></head><body>");
pw.println("<html><head><title>Jenkins Pipeline Reference</title></head><body>");
pw.println("<h1>Steps</h1>");
for (StepDescriptor d : getStepDescriptors(false)) {
generateStepHelp(d, pw);
@@ -11,7 +11,7 @@ exports.addSamplesWidget = function(editor) {
var $aceEditor = $('#workflow-editor');
var sampleSelect = $('<select></select>');

sampleSelect.append('<option >try sample workflow...</option>');
sampleSelect.append('<option >try sample Pipeline...</option>');
for (var i = 0; i < samples.length; i++) {
sampleSelect.append('<option value="' + samples[i].name + '">' + samples[i].title + '</option>');
}
@@ -25,5 +25,5 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<div>
Workflow execution engine based on continuation passing style transformation of Groovy scripts.
Pipeline execution engine based on continuation passing style transformation of Groovy scripts.
</div>
@@ -1,5 +1,5 @@
<div>
Relative location within the checkout of your Workflow script.
Relative location within the checkout of your Pipeline script.
Note that it will always be run inside a Groovy sandbox.
<code>Jenkinsfile</code> is conventional and allows you to switch easily to a multibranch project
(just use <code>checkout scm</code> to retrieve sources from the same location as is configured here).
@@ -13,7 +13,7 @@ node {
</p>
<p>
These definitions will also be available via the REST API during the build or after its completion,
and from upstream Workflow builds using the <code>build</code> step.
and from upstream Pipeline builds using the <code>build</code> step.
</p>
<p>
However any variables set this way are global to the workflow build.
@@ -24,7 +24,7 @@ node {
<p>
A set of environment variables are made available to all Jenkins projects, including workflows.
The following is a general list of variables (by name) that are available;
see the notes below the list for Workflow-specific details.
see the notes below the list for Pipeline-specific details.
</p>
<!-- Cf. EnvironmentContributor/EnvVarsHtml/index.groovy -->
<j:forEach var="ec" items="${it.environmentContributors}">
@@ -25,5 +25,5 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<div>
Defines a project type for multibranch workflows.
Defines a project type for multibranch pipelines.
</div>

0 comments on commit bd2d166

Please sign in to comment.
You can’t perform that action at this time.