diff --git a/protractor-shared.js b/protractor-shared.js index 21ed44c631..e004925487 100644 --- a/protractor-shared.js +++ b/protractor-shared.js @@ -155,7 +155,7 @@ var config = exports.config = { jasmineNodeOpts: { showColors: true, - defaultTimeoutInterval: argv.benchpress ? 80000 : 30000 + defaultTimeoutInterval: argv['benchmark'] ? 1200000 : 30000 }, params: { benchmark: { diff --git a/scripts/ci/env_dart.sh b/scripts/ci/env_dart.sh index 0626b1e8a1..2e20033502 100755 --- a/scripts/ci/env_dart.sh +++ b/scripts/ci/env_dart.sh @@ -70,6 +70,7 @@ if [[ -z $ENV_SET ]]; then export DARTSDK export DART export PUB=${PUB:-"$DART_SDK/bin/pub"} + export PUB_CACHE=$DART_SDK/pub-cache export DARTANALYZER=${DARTANALYZER:-"$DART_SDK/bin/dartanalyzer"} export DARTDOC=${DARTDOC:-"$DART_SDK/bin/dartdoc"} export DART_DOCGEN=${DART_DOCGEN:-"$DART_SDK/bin/docgen"} diff --git a/scripts/jenkins/jenkins_perf.sh b/scripts/jenkins/jenkins_perf.sh index e897945298..01324f2cfa 100755 --- a/scripts/jenkins/jenkins_perf.sh +++ b/scripts/jenkins/jenkins_perf.sh @@ -6,7 +6,7 @@ export ANDROID_SDK="/Users/Shared/jenkins/android-sdk" export PATH+=":$ANDROID_SDK/tools:$ANDROID_SDK/platform-tools" export PATH+=":/usr/local/git/bin" -export CHANNEL=stable +export DART_CHANNEL=dev export ARCH=macos-ia32 export PERF_BROWSERS=ChromeAndroid export CLOUD_SECRET_PATH="/Users/Shared/jenkins/keys/perf-cloud-secret" @@ -15,7 +15,12 @@ export GIT_SHA=$(git rev-parse HEAD) nvm use 0.10 ./scripts/ci/init_android.sh -./scripts/ci/install_dart.sh +./scripts/ci/install_dart.sh ${DART_CHANNEL} ${ARCH} +npm cache clean +# use newest npm because of errors during npm install like +# npm ERR! EEXIST, open '/Users/Shared/Jenkins/.npm/e4d0eb16-adable-stream-1-1-13-package-tgz.lock' +npm install -g npm@2.6 npm install -./scripts/ci/build.sh -./scripts/ci/test_perf.sh \ No newline at end of file +./scripts/ci/build_js.sh +./scripts/ci/build_dart.sh +./scripts/ci/test_perf.sh