From a6f4d549bd1057872b7f0c9ef148fefdb7e94179 Mon Sep 17 00:00:00 2001 From: spalger Date: Wed, 14 Jun 2017 20:40:00 -0700 Subject: [PATCH] move esvm directories to tmp dir --- .gitignore | 1 - .npmignore | 1 - grunt/config/esvm.js | 6 +++--- scripts/jenkins.sh | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e936a311d..5a054b0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ test/integration/yaml_suite/log .aws-config.json .idea esvm -.es-snapshot-repos /tmp ## generated files diff --git a/.npmignore b/.npmignore index 8d383be98..042437606 100644 --- a/.npmignore +++ b/.npmignore @@ -7,7 +7,6 @@ test/integration/yaml_suite/log .aws-config.json .idea esvm -.es-snapshot-repos /tmp ## generated files diff --git a/grunt/config/esvm.js b/grunt/config/esvm.js index aa0526314..54c28189b 100644 --- a/grunt/config/esvm.js +++ b/grunt/config/esvm.js @@ -11,12 +11,12 @@ const Version = require('../../scripts/Version'); const versionedOpts = [ { version: '*', - directory: fromRoot('esvm'), + directory: fromRoot('tmp/esvm'), nodes: 1, quiet: false, logLevel: 'ERROR', config: { - 'path.data': fromRoot('esvm/data_dir'), + 'path.data': fromRoot('tmp/esvm/data_dir'), 'node.name': 'elasticsearch_js_test_runner', 'cluster.name': 'elasticsearch_js_test_runners', 'http.port': port, @@ -71,7 +71,7 @@ const versionedOpts = [ version: '>=1.6', config: { 'script.inline': true, - 'path.repo': process.env.ES_PATH_REPO || fromRoot('.es-snapshot-repos'), + 'path.repo': process.env.ES_PATH_REPO || fromRoot('tmp/.es-snapshot-repos'), 'repositories.url.allowed_urls': 'http://snapshot.*' } } diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh index 4193a50c2..d58ab6f3f 100644 --- a/scripts/jenkins.sh +++ b/scripts/jenkins.sh @@ -57,4 +57,4 @@ install_node "$(cat ./.node-version)" yarn release_lock -ES_PATH_REPO="./.es-snapshot-repos/$EXECUTOR_NUMBER/" ES_PORT=$((9400 + EXECUTOR_NUMBER)) RUN=NODE_UNIT,NODE_INTEGRATION VERBOSE=true node ./scripts/ci.js +ES_PATH_REPO="./tmp/.es-snapshot-repos/$EXECUTOR_NUMBER/" ES_PORT=$((9400 + EXECUTOR_NUMBER)) RUN=NODE_UNIT,NODE_INTEGRATION VERBOSE=true node ./scripts/ci.js