From 144642c49054d5f9b9f67d887d3959a7e72ba31b Mon Sep 17 00:00:00 2001
From: Aaron Sheffield <ajs@sheffieldfamily.net>
Date: Fri, 22 Mar 2019 12:53:01 -0500
Subject: [PATCH] Updating Docker Gate use of zuul.newrev

- Zuul updated ansible to 2.7, no longer allows missing variables.
- Using default value when it isn't available.

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

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

diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml
index aa84bf1b..505f1e48 100644
--- a/tools/gate/playbooks/docker-image-build.yaml
+++ b/tools/gate/playbooks/docker-image-build.yaml
@@ -30,7 +30,7 @@
       environment:
         BRANCH: "{{ zuul.branch }}"
         CHANGE: "{{ zuul.change }}"
-        COMMIT: "{{ zuul.newrev }}"
+        COMMIT: "{{ zuul.newrev | default('') }}"
         PATCHSET: "{{ zuul.patchset }}"
       register: image_tags
 
@@ -83,7 +83,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 }}"