Skip to content
Snippets Groups Projects
Commit 43e5f566 authored by Nicolas "Pixel" Noble's avatar Nicolas "Pixel" Noble
Browse files

Various Jenkins-related tweaks.

-) created a .profile at the root of the docker image - seems the new nvm script requires that.
-) installing simplejson and mako python packages, for the sanity check.
-) calling prepare_travis.sh in order to try and download precompiled packages for openssl and protobuf.
-) using the new "config" axis.
-) improved the output of prepare_travis.sh.
parent 94528cb5
No related branches found
No related tags found
No related merge requests found
...@@ -83,6 +83,7 @@ ENV NUGET mono /var/local/NuGet.exe ...@@ -83,6 +83,7 @@ ENV NUGET mono /var/local/NuGet.exe
# Node dependencies # Node dependencies
# Install nvm # Install nvm
RUN touch .profile
RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash
RUN /bin/bash -l -c "nvm install 0.12" RUN /bin/bash -l -c "nvm install 0.12"
......
...@@ -56,9 +56,11 @@ then ...@@ -56,9 +56,11 @@ then
$FETCH_PULL_REQUEST_CMD \ $FETCH_PULL_REQUEST_CMD \
&& git checkout -f $GIT_COMMIT \ && git checkout -f $GIT_COMMIT \
&& git submodule update \ && git submodule update \
&& pip install simplejson mako \
&& nvm use 0.12 \ && nvm use 0.12 \
&& rvm use ruby-2.1 \ && rvm use ruby-2.1 \
&& tools/run_tests/run_tests.py -t -l $language" || DOCKER_FAILED="true" && CONFIG=$config tools/run_tests/prepare_travis.sh \
&& CPPFLAGS=-I/tmp/prebuilt/include tools/run_tests/run_tests.py -t -c $config -l $language" || DOCKER_FAILED="true"
DOCKER_CID=`cat docker.cid` DOCKER_CID=`cat docker.cid`
if [ "$DOCKER_FAILED" == "" ] if [ "$DOCKER_FAILED" == "" ]
......
...@@ -32,17 +32,17 @@ cd `dirname $0`/../.. ...@@ -32,17 +32,17 @@ cd `dirname $0`/../..
grpc_dir=`pwd` grpc_dir=`pwd`
distrib=`md5sum /etc/issue | cut -f1 -d\ ` distrib=`md5sum /etc/issue | cut -f1 -d\ `
echo "Configuring for disbribution $distrib" echo "Configuring for distribution $distrib"
git submodule | while read sha path extra ; do git submodule | while read sha path extra ; do
cd /tmp cd /tmp
name=`basename $path` name=`basename $path`
file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz
echo -n "$file ..." echo -n "Looking for $file ..."
url=http://storage.googleapis.com/grpc-prebuilt-packages/$file url=http://storage.googleapis.com/grpc-prebuilt-packages/$file
wget -q $url && ( wget -q $url && (
echo " Found." echo " Found."
tar xfz $file tar xfz $file
) || true ) || echo " Not found."
done done
mkdir -p bins/$CONFIG/protobuf mkdir -p bins/$CONFIG/protobuf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment