From 361fb33574a3a750b262bdc88cc71ead142fa162 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Tue, 3 Feb 2015 12:48:41 -0500
Subject: [PATCH] - Add a small build script - Take in the build worker branch
 name from config - Add additional logging (to be removed after we figure out
 the problem)

---
 build.sh                             | 1 +
 buildman/component/buildcomponent.py | 2 ++
 buildman/manager/executor.py         | 1 +
 buildman/templates/cloudconfig.yaml  | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100755 build.sh

diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000..9a4c8aae0
--- /dev/null
+++ b/build.sh
@@ -0,0 +1 @@
+docker build -t quay.io/quay/quay:`git rev-parse --short HEAD` .
\ No newline at end of file
diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index 5080f4fda..f43effb3a 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -201,6 +201,8 @@ class BuildComponent(BaseComponent):
       except ValueError:
         pass
 
+    logger.debug('Got log message: %s: (%s) => (%s)', phase, json_data, docker_data)
+
     # Extract the current status message (if any).
     fully_unwrapped = ''
     keys_to_extract = ['error', 'status', 'stream']
diff --git a/buildman/manager/executor.py b/buildman/manager/executor.py
index b9d38eb70..11f2a71c8 100644
--- a/buildman/manager/executor.py
+++ b/buildman/manager/executor.py
@@ -67,6 +67,7 @@ class BuilderExecutor(object):
         quay_password=quay_password,
         manager_hostname=manager_hostname,
         coreos_channel=coreos_channel,
+        worker_tag=self.executor_config['WORKER_TAG'],
     )
 
 
diff --git a/buildman/templates/cloudconfig.yaml b/buildman/templates/cloudconfig.yaml
index 33f545750..97958dc1a 100644
--- a/buildman/templates/cloudconfig.yaml
+++ b/buildman/templates/cloudconfig.yaml
@@ -31,6 +31,6 @@ coreos:
         TimeoutStartSec=600
         TimeoutStopSec=2000
         ExecStartPre=/usr/bin/docker login -u {{ quay_username }} -p {{ quay_password }} -e unused quay.io
-        ExecStart=/usr/bin/docker run --rm --net=host --name quay-builder --privileged --env-file /root/overrides.list -v /var/run/docker.sock:/var/run/docker.sock -v /usr/share/ca-certificates:/etc/ssl/certs quay.io/coreos/registry-build-worker:scratched
+        ExecStart=/usr/bin/docker run --rm --net=host --name quay-builder --privileged --env-file /root/overrides.list -v /var/run/docker.sock:/var/run/docker.sock -v /usr/share/ca-certificates:/etc/ssl/certs quay.io/coreos/registry-build-worker:{{ worker_tag }}
         ExecStop=/usr/bin/docker stop quay-builder
         ExecStopPost=/bin/sh -xc "/bin/sleep 120; /usr/bin/systemctl --no-block poweroff"