You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2017/10/25 19:18:47 UTC
nifi-registry git commit: NIFIREG-41 - Increase disconnect tolerance
in karma.conf and updated travis.yml
Repository: nifi-registry
Updated Branches:
refs/heads/master d441c95e6 -> 6dc8e5f7a
NIFIREG-41 - Increase disconnect tolerance in karma.conf and updated travis.yml
This closes #26.
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/6dc8e5f7
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/6dc8e5f7
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/6dc8e5f7
Branch: refs/heads/master
Commit: 6dc8e5f7a1a135fd053d480e0feb86c2467bbdbe
Parents: d441c95
Author: Scott Aslan <sc...@gmail.com>
Authored: Tue Oct 24 15:06:04 2017 -0400
Committer: Bryan Bende <bb...@apache.org>
Committed: Wed Oct 25 15:18:16 2017 -0400
----------------------------------------------------------------------
.travis.yml | 20 +++++++++++++-------
.../src/main/frontend/karma.conf.js | 2 +-
2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/6dc8e5f7/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 4f8da18..d344de8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,7 @@ env:
- USER_LANGUAGE=pt USER_REGION=BR'
- USER_LANGUAGE=default USER_REGION=default
-os:
- - linux
+os: linux
jdk:
- oraclejdk8
@@ -39,16 +38,23 @@ before_cache:
- rm -rf $HOME/.m2/repository/org/apache/nifi-registry/
addons:
- chrome: stable
+ chrome: beta
# before_install aids in setting up the Travis-CI environment
-# 1. simulate an `X` server on Travis CI for karma tests that require a GUI
-# 2. Configures pre-installed Chrome on Travis CI to be used in “headless” mode
+# 1. Configures pre-installed Chrome on Travis CI to be used in “headless” mode
before_install:
+ - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
+
+# before_script aids in setting up the Travis-CI environment
+# 1. simulate an `X` server on Travis CI for karma tests that require a GUI
+before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3 # give xvfb some time to start
- - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
+# skip the installation step entirely
install: true
-script: mvn -T 2C clean install -PjsUnitTests,integration-tests,contrib-check
\ No newline at end of file
+
+#build commands
+script:
+ - mvn -T 2C clean install -PjsUnitTests,integration-tests,contrib-check
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/6dc8e5f7/nifi-registry-web-ui/src/main/frontend/karma.conf.js
----------------------------------------------------------------------
diff --git a/nifi-registry-web-ui/src/main/frontend/karma.conf.js b/nifi-registry-web-ui/src/main/frontend/karma.conf.js
index b2aa3fa..b0543ca 100644
--- a/nifi-registry-web-ui/src/main/frontend/karma.conf.js
+++ b/nifi-registry-web-ui/src/main/frontend/karma.conf.js
@@ -29,7 +29,7 @@ module.exports = function (config) {
customLaunchers: {
Chrome_travis_ci: {
base: 'Chrome',
- flags: ['--no-sandbox']
+ flags: []
}
},
plugins: [