Skip to content

Commit

Permalink
move package installation to docker image to avoid on every run
Browse files Browse the repository at this point in the history
  • Loading branch information
bwindels committed Apr 9, 2019
1 parent 57092ee commit f5f89ee
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
9 changes: 3 additions & 6 deletions .buildkite/pipeline.yaml
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion scripts/ci/end-to-end-tests.sh
Expand Up @@ -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"
Expand Down

0 comments on commit f5f89ee

Please sign in to comment.