Bug 1290531 - Remove support for building with custom build.sh; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Fri, 29 Jul 2016 13:18:27 -0700
changeset 395037 b11e5bcdf6a23116d5aad179a30ebfe738b8b37c
parent 395036 77a2afa9021e7d609d353f5801baacca4e0980b6
child 395038 498f549d7e7034d6307ac456309e8e837840e358
push id24705
push userbmo:gps@mozilla.com
push dateMon, 01 Aug 2016 18:26:57 +0000
reviewersdustin
bugs1290531
milestone50.0a1
Bug 1290531 - Remove support for building with custom build.sh; r?dustin Now that tester-device is gone, there are no more images using custom build.sh scripts and that feature can be deleted. Yay simplicity. MozReview-Commit-ID: 5JqFZ2HOsWs
testing/docker/build.sh
--- a/testing/docker/build.sh
+++ b/testing/docker/build.sh
@@ -6,21 +6,16 @@
 
 gecko_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
 
 build() {
   local image_name=$1
   local tag=$2
   local folder="$gecko_root/testing/docker/$image_name"
 
-  if [ -f $folder/build.sh ]; then
-    shift
-    $folder/build.sh -t $tag $* || exit 1
-  else
-    # use --no-cache so that we always get the latest updates from yum
-    # and use the latest version of system-setup.sh
-    ( cd $folder/.. && docker build --no-cache -t $tag $image_name ) || exit 1
-  fi
+  # use --no-cache so that we always get the latest updates from yum
+  # and use the latest version of system-setup.sh
+  ( cd $folder/.. && docker build --no-cache -t $tag $image_name ) || exit 1
 
   echo "Success built $image_name and tagged with $tag"
 }
 
 build $*