From 51a18754c6905ed427af1852b13a51a6e2960933 Mon Sep 17 00:00:00 2001
From: Igor Belikov <ibelikov@mirantis.com>
Date: Tue, 10 Feb 2015 13:48:51 +0300
Subject: [PATCH] Add 'last-completed' to copyartifact 'which-build' values

Change-Id: I4ae84f7ca2d8d28195d6590c7a25d6c8886cde77
---
 jenkins_jobs/modules/builders.py              |  2 ++
 tests/builders/fixtures/copy-artifact002.xml  | 14 ++++++++++++++
 tests/builders/fixtures/copy-artifact002.yaml |  9 +++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 tests/builders/fixtures/copy-artifact002.xml
 create mode 100644 tests/builders/fixtures/copy-artifact002.yaml

diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index 6ff64db5e..9e8577667 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -109,6 +109,7 @@ def copyartifact(parser, xml_parent, data):
         parameters (optional)
     :which-build values:
       * **last-successful**
+      * **last-completed**
       * **specific-build**
       * **last-saved**
       * **upstream-build**
@@ -143,6 +144,7 @@ def copyartifact(parser, xml_parent, data):
     XML.SubElement(t, 'parameters').text = data.get("parameter-filters", "")
     select = data.get('which-build', 'last-successful')
     selectdict = {'last-successful': 'StatusBuildSelector',
+                  'last-completed': 'LastCompletedBuildSelector',
                   'specific-build': 'SpecificBuildSelector',
                   'last-saved': 'SavedBuildSelector',
                   'upstream-build': 'TriggeredBuildSelector',
diff --git a/tests/builders/fixtures/copy-artifact002.xml b/tests/builders/fixtures/copy-artifact002.xml
new file mode 100644
index 000000000..5b1e9a502
--- /dev/null
+++ b/tests/builders/fixtures/copy-artifact002.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <builders>
+    <hudson.plugins.copyartifact.CopyArtifact>
+      <project>foo</project>
+      <filter>*.txt</filter>
+      <target>/home/foo</target>
+      <flatten>true</flatten>
+      <optional>true</optional>
+      <parameters>PUBLISH=true</parameters>
+      <selector class="hudson.plugins.copyartifact.LastCompletedBuildSelector"/>
+    </hudson.plugins.copyartifact.CopyArtifact>
+  </builders>
+</project>
diff --git a/tests/builders/fixtures/copy-artifact002.yaml b/tests/builders/fixtures/copy-artifact002.yaml
new file mode 100644
index 000000000..be96371a7
--- /dev/null
+++ b/tests/builders/fixtures/copy-artifact002.yaml
@@ -0,0 +1,9 @@
+builders:
+  - copyartifact:
+      project: foo
+      filter: "*.txt"
+      target: /home/foo
+      which-build: last-completed
+      optional: true
+      flatten: true
+      parameter-filters: PUBLISH=true