chore: add back downloading pre-built binaries in system tests (#24)

chore: add back downloading pre-built binaries to system tests

Author: nolanmar511

.gitignore

@@ -1,7 +1,7 @@
 .nyc_output
 .coverage
 .vscode
-build
+/*.build
 out
 node_modules
 system-test/busybench/package-lock.json

system-test/Dockerfile.linux

@@ -7,18 +7,16 @@ RUN go get github.com/google/pprof
 
 FROM debian:stretch
 
-RUN apt-get update && apt-get install -y \
-    curl \
-    python \
-    make \
-    g++ \
- && rm -rf /var/lib/apt/lists/*
+ARG NODE_VERSION
+ARG NVM_NODEJS_ORG_MIRROR
+ARG ADDITIONAL_PACKAGES
+
+RUN apt-get update && apt-get install -y curl $ADDITIONAL_PACKAGES \
+    && rm -rf /var/lib/apt/lists/*
 
 ENV NVM_DIR /root/.nvm
 RUN mkdir -p $NVM_DIR
 
-ARG NODE_VERSION
-ARG NVM_NODEJS_ORG_MIRROR
 
 # Install nvm with node and npm
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash \

system-test/Dockerfile.node10-alpine

@@ -3,8 +3,12 @@ RUN apk update && apk upgrade && apk add --no-cache git
 WORKDIR /root/
 RUN go get github.com/google/pprof
 
+
 FROM node:10-alpine
-RUN apk update && apk upgrade && apk add --no-cache bash python g++ make
+
+ARG ADDITIONAL_PACKAGES
+
+RUN apk update && apk upgrade && apk add --no-cache bash $ADDITIONAL_PACKAGES
 WORKDIR /root/
 COPY --from=0 /go/bin/pprof /bin
 RUN chmod a+x /bin/pprof

system-test/Dockerfile.node11-alpine

@@ -3,8 +3,12 @@ RUN apk update && apk upgrade && apk add --no-cache git
 WORKDIR /root/
 RUN go get github.com/google/pprof
 
+
 FROM node:11-alpine
-RUN apk update && apk upgrade && apk add --no-cache bash python g++ make
+
+ARG ADDITIONAL_PACKAGES
+
+RUN apk update && apk upgrade && apk add --no-cache bash $ADDITIONAL_PACKAGES
 WORKDIR /root/
 COPY --from=0 /go/bin/pprof /bin
 RUN chmod a+x /bin/pprof

system-test/Dockerfile.node6-alpine

@@ -3,8 +3,12 @@ RUN apk update && apk upgrade && apk add --no-cache git
 WORKDIR /root/
 RUN go get github.com/google/pprof
 
+
 FROM node:6-alpine
-RUN apk update && apk upgrade && apk add --no-cache bash python g++ make
+
+ARG ADDITIONAL_PACKAGES
+
+RUN apk update && apk upgrade && apk add --no-cache bash $ADDITIONAL_PACKAGES
 WORKDIR /root/
 COPY --from=0 /go/bin/pprof /bin
 RUN chmod a+x /bin/pprof

system-test/Dockerfile.node8-alpine

@@ -3,8 +3,12 @@ RUN apk update && apk upgrade && apk add --no-cache git
 WORKDIR /root/
 RUN go get github.com/google/pprof
 
+
 FROM node:8-alpine
-RUN apk update && apk upgrade && apk add --no-cache bash python g++ make
+
+ARG ADDITIONAL_PACKAGES
+
+RUN apk update && apk upgrade && apk add --no-cache bash $ADDITIONAL_PACKAGES
 WORKDIR /root/
 COPY --from=0 /go/bin/pprof /bin
 RUN chmod a+x /bin/pprof

system-test/system_test.sh

@@ -12,13 +12,24 @@ retry() {
 
 cd $(dirname $0)
 
+if [[ -z "$BINARY_HOST" ]]; then
+  ADDITIONAL_PACKAGES="python g++ make"
+fi
+
 for i in 6 8 10 11; do
   # Test Linux support for the given node version.
-  retry docker build -f Dockerfile.linux --build-arg NODE_VERSION=$i -t node$i-linux .
-  docker run -v $PWD/..:/src node$i-linux /src/system-test/test.sh
+  retry docker build -f Dockerfile.linux --build-arg NODE_VERSION=$i \
+      --build-arg ADDITIONAL_PACKAGES="$ADDITIONAL_PACKAGES" -t node$i-linux .
+
+  docker run  -v $PWD/..:/src -e BINARY_HOST="$BINARY_HOST" node$i-linux \
+      /src/system-test/test.sh
+
   # Test Alpine support for the given node version.
-  docker build -f Dockerfile.node$i-alpine -t node$i-alpine .
-  docker run -v $PWD/..:/src node$i-alpine /src/system-test/test.sh
+  retry docker build -f Dockerfile.node$i-alpine \
+      --build-arg ADDITIONAL_PACKAGES="$ADDITIONAL_PACKAGES" -t node$i-alpine .
+
+  docker run -v $PWD/..:/src -e BINARY_HOST="$BINARY_HOST" node$i-alpine \
+      /src/system-test/test.sh
 done
 
 echo '** ALL TESTS PASSED **'

system-test/test.sh

@@ -15,9 +15,11 @@ NODEDIR=$(dirname $(dirname $(which node)))
 # For v8-canary tests, we need to use the version of NAN on github, which
 # contains unreleased fixes that allow the native component to be compiled
 # with Node's V8 canary build.
-[ -z $NVM_NODEJS_ORG_MIRROR ] || retry npm install https://github.com/nodejs/nan.git
+[ -z $NVM_NODEJS_ORG_MIRROR ] \
+    || retry npm install https://github.com/nodejs/nan.git
 
-retry npm install --nodedir="$NODEDIR" >/dev/null
+retry npm install --nodedir="$NODEDIR" \
+    ${BINARY_HOST:+--pprof_binary_host_mirror=$BINARY_HOST} >/dev/null
 
 npm run compile
 npm pack >/dev/null
@@ -29,14 +31,18 @@ cp -r "$PWD/system-test/busybench" "$TESTDIR"
 cd "$TESTDIR/busybench"
 
 retry npm install pify @types/pify typescript gts @types/node >/dev/null
-retry npm install --nodedir="$NODEDIR" "$PROFILER" >/dev/null
+retry npm install --nodedir="$NODEDIR" \
+    ${BINARY_HOST:+--pprof_binary_host_mirror=$BINARY_HOST} \
+    "$PROFILER" >/dev/null
 
 npm run compile >/dev/null
 
 node -v
 node --trace-warnings build/src/busybench.js 10
 ls -l
 
-pprof -filefunctions -top -nodecount=2 time.pb.gz | grep "busyLoop.*build/src/busybench.js"
-pprof -filefunctions -top -nodecount=2 heap.pb.gz | grep "busyLoop.*build/src/busybench.js"
+pprof -filefunctions -top -nodecount=2 time.pb.gz | \
+    grep "busyLoop.*build/src/busybench.js"
+pprof -filefunctions -top -nodecount=2 heap.pb.gz | \
+    grep "busyLoop.*build/src/busybench.js"
 echo '** TEST PASSED **'

tools/build/Dockerfile.alpine

@@ -0,0 +1,2 @@
+FROM node:10-alpine
+RUN apk add --no-cache python curl bash python g++ make