16029: Updates Dockerfile to build a seeded image with arvados boot deps.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/Dockerfile b/Dockerfile
index 6f4fe7e16ae09cd799f54dcd4a95eb9ff270ee3d..a6abbbd39c1634486ce325d5b92129c941d8a712 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,14 @@
 
 FROM node:8-buster
 MAINTAINER Ward Vandewege <ward@curoverse.com>
-RUN apt-get update
-RUN apt-get -q -y install libsecret-1-0 libsecret-1-dev rpm
-RUN apt-get install -q -y ruby ruby-dev rubygems build-essential
+RUN apt-get update && \
+    apt-get -yq --no-install-recommends -o Acquire::Retries=6 install \
+    libsecret-1-0 libsecret-1-dev rpm ruby ruby-dev rubygems build-essential \
+    golang libpam0g-dev && \
+    apt-get clean
 RUN gem install --no-ri --no-rdoc fpm
+RUN git clone https://git.arvados.org/arvados.git && cd arvados && \
+    go mod download && \
+    go run ./cmd/arvados-server install -type test && cd .. && \
+    rm -rf arvados && \
+    apt-get clean

diff --git a/Makefile b/Makefile
index 0963b7c9a91474e1efbf4063658a816aad336ed3..bb09fb2f3476ee3ed23a3c9fa9252f6f8602acbd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,15 @@ clean: clean-rpm clean-deb clean-node-modules
 yarn-install:
        yarn install
 
-test: yarn-install
+unit-tests: yarn-install
        yarn test --no-watchAll --bail --ci
 
+integration-tests: yarn-install
+       yarn run cypress install
+       $(WORKSPACE)/tools/run-integration-tests.sh
+
+test: unit-tests integration-tests
+
 build: test
        VERSION=$(VERSION) yarn build
 

diff --git a/tools/run-integration-tests.sh b/tools/run-integration-tests.sh
index 399354cf8c3399017e7598a545581634f12f9b74..0b582e16a3725c8873aed2de16c34dacce8bf416 100755 (executable)
--- a/tools/run-integration-tests.sh
+++ b/tools/run-integration-tests.sh
@@ -28,7 +28,7 @@ cd ${WORKDIR}
 go mod download || exit 1
 
 echo "Installing dev dependencies..."
-sudo go run ./cmd/arvados-server install -type test || exit 1
+go run ./cmd/arvados-server install -type test || exit 1
 
 echo "Running arvados in test mode..."
 ARVADOS_PORT=`random_free_port`