Skip to content
Snippets Groups Projects
Commit 84e5d431 authored by Maxim Khlobystov's avatar Maxim Khlobystov
Browse files

Split the build into stages

parent 216cebe6
No related branches found
No related tags found
No related merge requests found
...@@ -2,9 +2,24 @@ dist: trusty ...@@ -2,9 +2,24 @@ dist: trusty
language: node_js language: node_js
env:
- JOB_TYPE=linter
- JOB_TYPE=acceptance_tests
node_js: node_js:
- "8" - "8"
jobs:
allow_failures:
- env: JOB_TYPE=linter
include:
- stage: "Linter"
name: "ESLint"
env: JOB_TYPE=linter
- stage: "Tests"
name: "Acceptance Tests"
env: JOB_TYPE=acceptance_tests
if: type = pull_request if: type = pull_request
env: env:
...@@ -12,7 +27,7 @@ env: ...@@ -12,7 +27,7 @@ env:
- BBB_SERVER_URL=http://localhost/bigbluebutton/api - BBB_SERVER_URL=http://localhost/bigbluebutton/api
script: script:
- travis_wait bash ./build_script.sh - travis_wait bash ./build_script.sh $JOB_TYPE
after_script: after_script:
- docker stop $docker - docker stop $docker
......
...@@ -3,27 +3,31 @@ set -ev ...@@ -3,27 +3,31 @@ set -ev
files=`git diff --name-only HEAD..$TRAVIS_BRANCH` files=`git diff --name-only HEAD..$TRAVIS_BRANCH`
if [[ $files = *"bigbluebutton-html5"* ]]; then if [[ $files = *"bigbluebutton-html5"* ]]; then
{ cd bigbluebutton-html5
cd bigbluebutton-html5 curl https://install.meteor.com/ | sh
git clone --single-branch -b update-html5 https://github.com/bigbluebutton/docker.git meteor npm install
cp -r docker/{mod,restart.sh,setup.sh,supervisord.conf} . if [ $1 = linter ]
cp -r docker/Dockerfile Dockerfile.test then
docker build -t b2 -f Dockerfile.test . cd ..
docker=$(docker run -d -p 80:80/tcp -p 443:443/tcp -p 1935:1935 -p 5066:5066 -p 3478:3478 -p 3478:3478/udp b2 -h localhost) bigbluebutton-html5/node_modules/.bin/eslint --ext .jsx,.js $files
echo $docker elif [ $1 = acceptance_tests ]
then
{
git clone --single-branch -b update-html5 https://github.com/bigbluebutton/docker.git
cp -r docker/{mod,restart.sh,setup.sh,supervisord.conf} .
cp -r docker/Dockerfile Dockerfile.test
docker build -t b2 -f Dockerfile.test .
docker=$(docker run -d -p 80:80/tcp -p 443:443/tcp -p 1935:1935 -p 5066:5066 -p 3478:3478 -p 3478:3478/udp b2 -h localhost)
echo $docker
} > /dev/null
cd tests/puppeteer cd tests/puppeteer
npm install npm install
conf=$(docker exec $(docker ps -q) bbb-conf --secret | grep "Secret:") conf=$(docker exec $(docker ps -q) bbb-conf --secret | grep "Secret:")
secret=$(echo $conf | cut -d' ' -f2) secret=$(echo $conf | cut -d' ' -f2)
export BBB_SHARED_SECRET=$secret export BBB_SHARED_SECRET=$secret
node html5-check.js
cd ../.. node html5-check.js
curl https://install.meteor.com/ | sh npm test
meteor npm install fi
cd tests/puppeteer
npm install
cd ../../..
} > /dev/null
bigbluebutton-html5/node_modules/.bin/eslint --ext .jsx,.js $files
fi fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment