Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-31153] @jglick's suggestion was addressed
  • Loading branch information
recena committed Jan 15, 2016
1 parent 9c41a4a commit 2ca9e66
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,7 +2,7 @@

Building continuous delivery pipelines and similarly complex tasks in Jenkins using freestyle projects and traditional plugins can be awkward.
You need to mix Parameterized Trigger, Copy Artifact, Promoted Builds, Conditional Build Step, and more just to express what should be a simple script.
The Pipeline plugin suite attempts to make it possible to directly write that script, what people often call a _workflow_ (sometimes abbreviated _flow_), while integrating with Jenkins features like slaves and publishers.
The Pipeline plugin (formerly known as Workflow) suite attempts to make it possible to directly write that script, what people often call a _pipeline_, while integrating with Jenkins features like slaves and publishers.

# Features

Expand All @@ -19,7 +19,7 @@ Plugins can add further steps.

## Pause and resume execution

If Jenkins is restarted (intentionally, or because of a crash) while your workflow is running, when it comes back up, execution is resumed where it left off.
If Jenkins is restarted (intentionally, or because of a crash) while your Pipeline is running, when it comes back up, execution is resumed where it left off.
This applies to external processes (shell scripts) so long as the slave can be reattached, and losing the slave connection temporarily is not fatal either.

Pipelines can pause in the middle and wait for a human to approve something, or enter some information.
Expand Down
4 changes: 2 additions & 2 deletions TUTORIAL.md
@@ -1,8 +1,8 @@
This document is intended for new users of the Pipeline feature to learn how to write and understand pipelines.
This document is intended for new users of the pipeline feature to learn how to write and understand pipelines.

# Why Pipeline?

Pipeline was built with the community’s requirements for a flexible, extensible, and script-based CD pipeline capability for Jenkins in mind. To that end, Pipeline:
Pipeline (formerly known as Workflow) was built with the community’s requirements for a flexible, extensible, and script-based CD pipeline capability for Jenkins in mind. To that end, Pipeline:

* Can support complex, real-world, CD Pipeline requirements: pipelines can fork/join, loop, *parallel*, to name a few
* Is Resilient: pipeline executions can survive master restarts
Expand Down
2 changes: 1 addition & 1 deletion aggregator/pom.xml
Expand Up @@ -32,7 +32,7 @@
</parent>
<artifactId>workflow-aggregator</artifactId>
<packaging>hpi</packaging>
<name>Pipeline</name>
<name>Pipeline (formerly known as Workflow)</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Workflow+Plugin</url>
<dependencies>
<dependency>
Expand Down
Expand Up @@ -26,6 +26,6 @@

<j:jelly xmlns:j="jelly:core">
Orchestrates long-running activities that can span multiple build slaves. Suitable for
building pipelines and/or organizing complex activities that do not easily fit
building pipelines (formerly known as workflows) and/or organizing complex activities that do not easily fit
in free-style job type.
</j:jelly>

0 comments on commit 2ca9e66

Please sign in to comment.