From 3c3028f5b88ed6304904cf10d8ed1811f71037f1 Mon Sep 17 00:00:00 2001
From: tanhengyeow <E0032242@u.nus.edu>
Date: Mon, 10 Sep 2018 01:57:10 +0800
Subject: [PATCH] docker-build-publish: Improve support for new options

Change-Id: I316989cc736bb4ffb6152c68e4b3ff598b4274db
Signed-off-by: Tan Heng Yeow <E0032242@u.nus.edu>
---
 jenkins_jobs/modules/builders.py               | 9 +++++++++
 tests/builders/fixtures/docker-builder001.xml  | 3 +++
 tests/builders/fixtures/docker-builder001.yaml | 3 +++
 tests/builders/fixtures/docker-builder002.xml  | 3 +++
 tests/builders/fixtures/docker-builder002.yaml | 3 +++
 5 files changed, 21 insertions(+)

diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index 9cf9bdf22..d25605188 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -3950,6 +3950,12 @@ def docker_build_publish(parse, xml_parent, data):
     :arg str file-path: Path of the Dockerfile. (default '')
     :arg str build-context: Project root path for the build, defaults to the
         workspace if not specified. (default '')
+    :arg bool create-fingerprint: If enabled, the plugin will create
+        fingerprints after the build of each image. (default false)
+    :arg str build-args: Additional build arguments passed to
+        docker build (default '')
+    :arg bool force-tag: Force tag replacement when tag already
+        exists (default false)
 
     Minimal example:
 
@@ -3974,6 +3980,9 @@ def docker_build_publish(parse, xml_parent, data):
         ('skip-push', 'skipPush', False),
         ('file-path', 'dockerfilePath', ''),
         ('build-context', 'buildContext', ''),
+        ('create-fingerprint', 'createFingerprint', False),
+        ('build-args', 'buildAdditionalArgs', ''),
+        ('force-tag', 'forceTag', False),
     ]
     helpers.convert_mapping_to_xml(db, data, mapping, fail_required=True)
 
diff --git a/tests/builders/fixtures/docker-builder001.xml b/tests/builders/fixtures/docker-builder001.xml
index 5543bd267..57d74d21f 100644
--- a/tests/builders/fixtures/docker-builder001.xml
+++ b/tests/builders/fixtures/docker-builder001.xml
@@ -12,6 +12,9 @@
       <skipPush>false</skipPush>
       <dockerfilePath>/tmp/</dockerfilePath>
       <buildContext>/tmp/</buildContext>
+      <createFingerprint>true</createFingerprint>
+      <buildAdditionalArgs>--build-arg https_proxy=&quot;http://some.proxy:port&quot;</buildAdditionalArgs>
+      <forceTag>true</forceTag>
     </com.cloudbees.dockerpublish.DockerBuilder>
   </builders>
 </project>
diff --git a/tests/builders/fixtures/docker-builder001.yaml b/tests/builders/fixtures/docker-builder001.yaml
index bfecba1fd..179bec2de 100644
--- a/tests/builders/fixtures/docker-builder001.yaml
+++ b/tests/builders/fixtures/docker-builder001.yaml
@@ -10,3 +10,6 @@ builders:
         skip-tag: false
         file-path: '/tmp/'
         build-context: '/tmp/'
+        create-fingerprint: true
+        build-args: --build-arg https_proxy="http://some.proxy:port"
+        force-tag: true
diff --git a/tests/builders/fixtures/docker-builder002.xml b/tests/builders/fixtures/docker-builder002.xml
index 3506fa2a6..960fe753f 100644
--- a/tests/builders/fixtures/docker-builder002.xml
+++ b/tests/builders/fixtures/docker-builder002.xml
@@ -12,6 +12,9 @@
       <skipPush>false</skipPush>
       <dockerfilePath>/tmp/</dockerfilePath>
       <buildContext>/tmp/</buildContext>
+      <createFingerprint>true</createFingerprint>
+      <buildAdditionalArgs>--build-arg https_proxy=&quot;http://some.proxy:port&quot;</buildAdditionalArgs>
+      <forceTag>true</forceTag>
       <server plugin="docker-commons">
         <credentialsId>docker-server</credentialsId>
         <uri>unix:///var/run/docker.sock</uri>
diff --git a/tests/builders/fixtures/docker-builder002.yaml b/tests/builders/fixtures/docker-builder002.yaml
index 35ed90a10..8200072f6 100644
--- a/tests/builders/fixtures/docker-builder002.yaml
+++ b/tests/builders/fixtures/docker-builder002.yaml
@@ -10,6 +10,9 @@ builders:
         skip-tag: false
         file-path: '/tmp/'
         build-context: '/tmp/'
+        create-fingerprint: true
+        build-args: --build-arg https_proxy="http://some.proxy:port"
+        force-tag: true
         registry:
             url: 'https://registry.example.org'
             credentials-id: 'registry-docker'