Clean up image build script

This change allows the image build script to support the existing
jobs that build images for distribution, as well as future jobs that
build the image within devstack for testing.

Change-Id: I6cae0ce336fde872678fafe6ba2b31af465944a1

coreos/build_coreos_image.sh

@@ -0,0 +1,24 @@
+#!/bin/bash -xe
+#
+# This builds a CoreOS IPA image, assuming dependencies are installed
+#
+# The system this runs on needs these binaries available, most of which
+# are installed by default on Ubuntu Trusty:
+#  - docker
+#  - gzip / gunzip
+#  - uuidgen
+#  - cpio
+#  - find (gnu)
+#  - grep
+#  - gpg (to validate key of downloaded CoreOS image)
+#
+# Alternatively, run full_trusty_build.bash which will install
+# all requirements then perform the build.
+
+if [[ -x /usr/bin/docker.io ]]; then
+    sudo ln -sf /usr/bin/docker.io /usr/local/bin/docker
+fi
+cd imagebuild/coreos
+sudo pip install -r requirements.txt
+sudo make clean
+sudo make

coreos/full_trusty_build.sh

@@ -5,10 +5,8 @@
 #
 sudo apt-get update
 sudo apt-get install -y docker.io
-sudo ln -sf /usr/bin/docker.io /usr/local/bin/docker
-sudo sed -i '$acomplete -F _docker docker' /etc/bash_completion.d/docker.io
-cd imagebuild/coreos/
-pwd
-sudo pip install -r requirements.txt
-sudo make
-tar czf ../../ipa-coreos.tar.gz UPLOAD/coreos_production_pxe_image-oem.cpio.gz UPLOAD/coreos_production_pxe.vmlinuz
+
+imagebuild/coreos/build_coreos_image.sh
+
+BUILD_DIR=imagebuild/coreos/UPLOAD
+tar czf ipa-coreos.tar.gz $BUILD_DIR/coreos_production_pxe_image-oem.cpio.gz $BUILD_DIR/coreos_production_pxe.vmlinuz