From 7c9b2253f1c533a062c0564d08c872ab1a471fb0 Mon Sep 17 00:00:00 2001
From: Matt McEuen <matt.mceuen@att.com>
Date: Fri, 22 Mar 2019 12:05:25 -0500
Subject: [PATCH] Updating Docker Gate use of zuul.newrev

- Zuul updated ansible to 2.7, no longer uses missing variables.
- Using an if to try and address.

Based on Aaron Sheffield's PS for Pegleg:
https://review.openstack.org/#/c/645631/

Change-Id: I6cf52a2b9c804c29cc727ad60d45c05a8450c9e9
---
 tools/zuul/playbooks/docker-image-build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml
index b1cba566..d54ec7ff 100644
--- a/tools/zuul/playbooks/docker-image-build.yaml
+++ b/tools/zuul/playbooks/docker-image-build.yaml
@@ -62,7 +62,7 @@
       environment:
         BRANCH: "{{ zuul.branch }}"
         CHANGE: "{{ zuul.change }}"
-        COMMIT: "{{ zuul.newrev }}"
+        COMMIT: "{{ zuul.newrev | default('') }}"
         PATCHSET: "{{ zuul.patchset }}"
       register: image_tags
 
@@ -102,7 +102,7 @@
               DOCKER_REGISTRY: "quay.io"
               IMAGE_PREFIX: "airshipit"
               IMAGE_TAG: "{{ item }}"
-              COMMIT: "{{ zuul.newrev }}"
+              COMMIT: "{{ zuul.newrev | default('') }}"
               PUSH_IMAGE: "true"
           with_items: "{{ image_tags.stdout_lines }}"