make e2e tests job conditional at travis.yml level

.travis.yml

@@ -22,6 +22,7 @@ matrix:
             # run the linter, but exclude any files known to have errors or warnings.
             - npm run lintwithexclusions
         - name: End-to-End Tests
+          if: branch = develop
           install:
             - sudo apt-get install build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libjpeg-dev libxslt1-dev
           script:

scripts/travis/end-to-end-tests.sh

@@ -9,16 +9,13 @@ set -ev
 RIOT_WEB_DIR=riot-web
 REACT_SDK_DIR=`pwd`
 
-if [ "$TRAVIS_BRANCH" = "develop" ]
+scripts/travis/build.sh
-then
+# run end to end tests
-    scripts/travis/build.sh
+scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master
-    # run end to end tests
+pushd matrix-react-end-to-end-tests
-    scripts/fetchdep.sh matrix-org matrix-react-end-to-end-tests master
+ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
-    pushd matrix-react-end-to-end-tests
+# PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
-    ln -s $REACT_SDK_DIR/$RIOT_WEB_DIR riot/riot-web
+# CHROME_PATH=$(which google-chrome-stable) ./run.sh
-    # PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true ./install.sh
+./install.sh
-    # CHROME_PATH=$(which google-chrome-stable) ./run.sh
+./run.sh --travis
-    ./install.sh
+popd
-    ./run.sh --travis
-    popd
-fi

scripts/travis/install-deps.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set -ex
-
+npm install
 scripts/fetchdep.sh matrix-org matrix-js-sdk
 rm -r node_modules/matrix-js-sdk || true
 ln -s ../matrix-js-sdk node_modules/matrix-js-sdk