Skip to content
Snippets Groups Projects
Commit 2b778d69 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

copy service account key logic

parent 075821f7
Branches
Tags
No related merge requests found
...@@ -35,12 +35,12 @@ set -x ...@@ -35,12 +35,12 @@ set -x
cd `dirname $0`/../.. cd `dirname $0`/../..
GRPC_ROOT=`pwd` GRPC_ROOT=`pwd`
MOUNT_ARGS="-v $GRPC_ROOT:/var/local/jenkins/grpc" MOUNT_ARGS="-v $GRPC_ROOT:/var/local/jenkins/grpc:ro"
GRPC_JAVA_ROOT=`cd ../grpc-java && pwd` GRPC_JAVA_ROOT=`cd ../grpc-java && pwd`
if [ "$GRPC_JAVA_ROOT" != "" ] if [ "$GRPC_JAVA_ROOT" != "" ]
then then
MOUNT_ARGS+=" -v $GRPC_JAVA_ROOT:/var/local/jenkins/grpc-java" MOUNT_ARGS+=" -v $GRPC_JAVA_ROOT:/var/local/jenkins/grpc-java:ro"
else else
echo "WARNING: grpc-java not found, it won't be mounted to the docker container." echo "WARNING: grpc-java not found, it won't be mounted to the docker container."
fi fi
...@@ -48,7 +48,7 @@ fi ...@@ -48,7 +48,7 @@ fi
GRPC_GO_ROOT=`cd ../grpc-go && pwd` GRPC_GO_ROOT=`cd ../grpc-go && pwd`
if [ "$GRPC_GO_ROOT" != "" ] if [ "$GRPC_GO_ROOT" != "" ]
then then
MOUNT_ARGS+=" -v $GRPC_GO_ROOT:/var/local/jenkins/grpc-go" MOUNT_ARGS+=" -v $GRPC_GO_ROOT:/var/local/jenkins/grpc-go:ro"
else else
echo "WARNING: grpc-go not found, it won't be mounted to the docker container." echo "WARNING: grpc-go not found, it won't be mounted to the docker container."
fi fi
...@@ -60,6 +60,14 @@ mkdir -p /tmp/ccache ...@@ -60,6 +60,14 @@ mkdir -p /tmp/ccache
# BASE_NAME - base name used to locate the base Dockerfile and build script # BASE_NAME - base name used to locate the base Dockerfile and build script
# TTY_FLAG - optional -t flag to make docker allocate tty. # TTY_FLAG - optional -t flag to make docker allocate tty.
# Mount service account dir if available.
# If service_directory does not contain the service account JSON file,
# some of the tests will fail.
if [ -e $HOME/service_account ]
then
MOUNT_ARGS+=" -v $HOME/service_account:/var/local/jenkins/service_account:ro"
fi
# Use image name based on Dockerfile checksum # Use image name based on Dockerfile checksum
BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/jenkins/$BASE_NAME/Dockerfile | cut -f1 -d\ ` BASE_IMAGE=${BASE_NAME}_base:`sha1sum tools/jenkins/$BASE_NAME/Dockerfile | cut -f1 -d\ `
......
...@@ -34,6 +34,9 @@ set -e ...@@ -34,6 +34,9 @@ set -e
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc cd /var/local/git/grpc
make install-certs make install-certs
......
...@@ -34,6 +34,9 @@ set -e ...@@ -34,6 +34,9 @@ set -e
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc cd /var/local/git/grpc
make install-certs make install-certs
......
...@@ -36,6 +36,9 @@ set -e ...@@ -36,6 +36,9 @@ set -e
# to test instead of using "go get" to download from Github directly. # to test instead of using "go get" to download from Github directly.
git clone --recursive /var/local/jenkins/grpc-go src/gooogle.golang.org/grpc git clone --recursive /var/local/jenkins/grpc-go src/gooogle.golang.org/grpc
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
# Get dependencies from GitHub # Get dependencies from GitHub
# NOTE: once grpc-go dependencies change, this needs to be updated manually # NOTE: once grpc-go dependencies change, this needs to be updated manually
# but we don't expect this to happen any time soon. # but we don't expect this to happen any time soon.
......
...@@ -34,6 +34,9 @@ set -e ...@@ -34,6 +34,9 @@ set -e
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive --depth 1 /var/local/jenkins/grpc-java /var/local/git/grpc-java git clone --recursive --depth 1 /var/local/jenkins/grpc-java /var/local/git/grpc-java
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc-java cd /var/local/git/grpc-java
./gradlew :grpc-interop-testing:installDist -PskipCodegen=true ./gradlew :grpc-interop-testing:installDist -PskipCodegen=true
...@@ -34,6 +34,9 @@ set -e ...@@ -34,6 +34,9 @@ set -e
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc cd /var/local/git/grpc
nvm use 0.12 nvm use 0.12
nvm alias default 0.12 # prevent the need to run 'nvm use' in every shell nvm alias default 0.12 # prevent the need to run 'nvm use' in every shell
......
...@@ -34,6 +34,9 @@ set -e ...@@ -34,6 +34,9 @@ set -e
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc cd /var/local/git/grpc
rvm --default use ruby-2.1 rvm --default use ruby-2.1
......
...@@ -34,6 +34,9 @@ set -e ...@@ -34,6 +34,9 @@ set -e
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
cd /var/local/git/grpc cd /var/local/git/grpc
rvm --default use ruby-2.1 rvm --default use ruby-2.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment