Improve cloudbuild

This gets rid of duplicate code.

Change-Id: Ia9e72d97f599bfe29dd6c9f84eb3e21229f72679

Author: mering

cloudbuild.sh

@@ -1,51 +1,8 @@
 #!/bin/bash -e
 
-# Build script for Google Cloud Build
+./cloudbuild_setup.sh
 
-function log() {
-  d=$(date +'%Y-%m-%d %H:%M:%S')
-  echo $d" "$1
-}
-
-log "Running Copybara tests"
-
-log "Fetching dependencies"
-log "Running apt-get update --fix-missing"
-
-apt-get update --fix-missing
-apt-get install locales
-apt-get -y install mercurial
-apt-get install -y lsb-release
-apt-get install -y software-properties-common
-
-add-apt-repository ppa:git-core/ppa -y
-apt install git -y
-
-apt-get -y install quilt
-
-log "Extracting Bazel"
-# Only because first time it extracts the installation
-bazel version
-
-echo "-----------------------------------"
-echo "Versions:"
-lsb_release -a
-hg --version | grep "(version" | sed 's/.*[(]version \([^ ]*\)[)].*/Mercurial: \1/'
-git --version | sed 's/git version/Git:/'
-bazel version | grep "Build label" | sed 's/Build label:/Bazel:/'
-java -version
-echo "Quilt:"
-quilt --version
-echo "-----------------------------------"
-
-log "Setting Locale"
-export LANGUAGE=en_US.UTF-8
-export LANG=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-locale-gen en_US.UTF-8
-update-locale LANG=en_US.UTF-8
-
-echo "Running 'bazel $@'"
+log "Running 'bazel $@'"
 time bazel "$@"
 
 log "Done"

cloudbuild_setup.sh

@@ -13,14 +13,15 @@ log "Fetching dependencies"
 log "Running apt-get update --fix-missing"
 
 apt-get update --fix-missing
-apt-get install locales
-apt-get -y install mercurial
-apt-get -y install software-properties-common
+apt-get install -y locales
+apt-get install -y mercurial
+apt-get install -y lsb-release
+apt-get install -y software-properties-common
 
 add-apt-repository ppa:git-core/ppa -y
 apt install git -y
 
-apt-get -y install quilt
+apt-get install -y quilt
 
 log "Extracting Bazel"
 # Only because first time it extracts the installation