From 15bbcbb8d84477e4051dba56bfeb13a4368b14f8 Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Thu, 19 Apr 2018 09:43:51 -0400
Subject: [PATCH] Fix docker image build job

The commands need to be run as root.

Also adds a test job for the docker image build so that zuul will run
the experimental job to test before merging.

Change-Id: I1d1cb6979865d7ef22587315544f39646bc9d49d
Closes-Bug: #1765421
---
 .zuul.yaml                           | 10 +++++++++-
 playbooks/docker-buildimage/run.yaml | 12 +++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 340670ccf..0cc0005c5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,6 +45,14 @@
     required-projects:
       - openstack/mistral
 
+- job:
+    name: mistral-docker-buildimage-test
+    run: playbooks/docker-buildimage/run.yaml
+    post-run: playbooks/docker-buildimage/post.yaml
+    timeout: 1800
+    required-projects:
+      - openstack/mistral
+
 # This job does not work. We can come back to it later.
 # - job:
 #     name: mistral-ha
@@ -104,7 +112,7 @@
             branches: master
     experimental:
       jobs:
-        - mistral-docker-buildimage:
+        - mistral-docker-buildimage-test:
             branches: master
         # This job doesn't work yet.
         # - mistral-ha:
diff --git a/playbooks/docker-buildimage/run.yaml b/playbooks/docker-buildimage/run.yaml
index 8184f36e5..872765eb8 100644
--- a/playbooks/docker-buildimage/run.yaml
+++ b/playbooks/docker-buildimage/run.yaml
@@ -6,15 +6,25 @@
       shell: curl -fsSL https://get.docker.com/ | sh
       args:
         chdir: '{{ work_dir }}'
+      become: yes
 
     - name: Restart Docker service
       service:
         name: docker
         state: restarted
+      become: yes
+
+    - name: Install docker-py
+      pip:
+        name: docker-py
+      become: yes
 
     - name: Build and archive a Mistral image
       docker_image:
         name: mistral
         path: '{{ work_dir }}'
         dockerfile: '{{ work_dir }}/tools/docker/Dockerfile'
-        archive_path: '{{ work_dir}}}/mistral-docker.tar.gz'
+        archive_path: '{{ work_dir}}/mistral-docker.tar.gz'
+        buildargs:
+          BUILD_V8EVAL: false
+      become: yes