From 0042d49d36f1cffd9dfd906797ce397dde7de95c Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 22 Oct 2015 12:14:58 -0700 Subject: [PATCH] Run Docker Build in Ubuntu CI --- netci.groovy | 2 +- scripts/ci_build.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/netci.groovy b/netci.groovy index aaaac5d63..1d580b8cd 100644 --- a/netci.groovy +++ b/netci.groovy @@ -7,7 +7,7 @@ def project = 'dotnet/cli' def osList = ['Ubuntu', 'OSX', 'Windows_NT'] -def machineLabelMap = ['Ubuntu':'ubuntu', +def machineLabelMap = ['Ubuntu':'ubuntu-doc', 'OSX':'mac', 'Windows_NT':'windows'] diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 7a378a6b7..a54abae73 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -2,7 +2,11 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -$SCRIPT_DIR/../build.sh $@ +if [[ "$(uname)" == "Linux" ]]; then + $SCRIPT_DIR/dockerbuild.sh $@ +else + $SCRIPT_DIR/../build.sh $@ +fi ret_code=$? exit $ret_code