Skip to content

Commit

Permalink
fix: Use trusty for the second profile2
Browse files Browse the repository at this point in the history
  • Loading branch information
1ambda committed Jul 11, 2017
1 parent bf62085 commit 0dc0304
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
13 changes: 11 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ cache:
- zeppelin-web/bower_components

addons:
chrome: stable
apt:
sources:
- r-packages-precise
Expand All @@ -47,8 +46,18 @@ matrix:
# env: SCALA_VER="2.11" SPARK_VER="2.0.2" HADOOP_VER="2.6" PROFILE="-Prat" BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check" TEST_PROJECTS=""

# Run e2e tests (in zeppelin-web)
- jdk: "oraclejdk7"
- os: linux
sudo: false
dist: trusty
jdk: "oraclejdk8"
env: WEB_E2E="true" SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pscala-2.11" BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="verify -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl zeppelin-web" TEST_PROJECTS="-Pweb-e2e"
addons:
apt:
sources:
- r-packages-trusty
packages:
- google-chrome-stable
- r-base-dev

# Test core modules
# Several tests were excluded from this configuration due to the following issues:
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dev:watch": "grunt watch-webpack-dev",
"dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
"test:watch": "karma start karma.conf.js --single-run=false",
"pree2e": "webdriver-manager update --gecko false --versions.chrome=2.11",
"pree2e": "webdriver-manager update --gecko false --versions.chrome=2.27",
"e2e": "protractor protractor.conf.js",
"pretest": "npm rebuild phantomjs-prebuilt",
"test": "karma start karma.conf.js"
Expand Down

0 comments on commit 0dc0304

Please sign in to comment.