From f5f89ee4e301b0dec081b06402dbc4a3437695e7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 9 Apr 2019 17:56:03 +0200 Subject: [PATCH] move package installation to docker image to avoid on every run --- .buildkite/pipeline.yaml | 9 +++------ scripts/ci/Dockerfile | 9 +++++++++ scripts/ci/end-to-end-tests.sh | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 scripts/ci/Dockerfile diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 3e92bd483a..2df498f40a 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -10,18 +10,15 @@ steps: - label: ":chains: End-to-End Tests" command: # TODO: Remove hacky chmod for BuildKite - - "echo \"--- Installing packages, & setup\"" + - "echo '--- Setup'" - "chmod +x ./scripts/ci/*.sh" - "chmod +x ./scripts/*" - - "apt-get update" - - "apt-get -y install build-essential python3-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev uuid-runtime" - # dependencies for chrome (installed by puppeteer) - - "apt-get -y install gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" + - "echo '--- Install js-sdk'" - "./scripts/ci/install-deps.sh" - "./scripts/ci/end-to-end-tests.sh" plugins: - docker#v3.0.1: - image: "node:10" + image: "matrixdotorg/riotweb-ci-e2etests-env:latest" - label: ":karma: Tests" agents: diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile new file mode 100644 index 0000000000..c153d11cc7 --- /dev/null +++ b/scripts/ci/Dockerfile @@ -0,0 +1,9 @@ +# Update on docker hub with the following commands in the directory of this file: +# docker build -t matrixdotorg/riotweb-ci-e2etests-env:latest . +# docker log +# docker push matrixdotorg/riotweb-ci-e2etests-env:latest +FROM node:10 +RUN apt-get update +RUN apt-get -y install build-essential python3-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev uuid-runtime +# dependencies for chrome (installed by puppeteer) +RUN apt-get -y install gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget diff --git a/scripts/ci/end-to-end-tests.sh b/scripts/ci/end-to-end-tests.sh index 0d1f973418..0ec26df450 100644 --- a/scripts/ci/end-to-end-tests.sh +++ b/scripts/ci/end-to-end-tests.sh @@ -25,7 +25,7 @@ RIOT_WEB_DIR=riot-web REACT_SDK_DIR=`pwd` -echo "--- Building copy of Riot" +echo "--- Building Riot" scripts/ci/build.sh # run end to end tests echo "--- Fetching end-to-end tests from master"