diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..a1f8bb4fac7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,51 @@ +.idea/ +.gradle/ +*.iml +*.ipr +*.iws +work/ +/data/ +logs/ +.DS_Store +build/ +build-idea/ +build-eclipse/ +generated-resources/ +target/ +*-execution-hints.log +docs/html/ +docs/build.log +npm-debug.log +/tmp/ +backwards/ +html_docs +.vagrant/ +vendor/ +.bundle +Gemfile.lock + +## eclipse ignores (use 'mvn eclipse:eclipse' to build eclipse projects) +## All files (.project, .classpath, .settings/*) should be generated through Maven which +## will correctly set the classpath based on the declared dependencies and write settings +## files to ensure common coding style across Eclipse and IDEA. +.project +.classpath +eclipse-build +*/.project +*/.classpath +*/eclipse-build +.settings +!/.settings/org.eclipse.core.resources.prefs +!/.settings/org.eclipse.jdt.core.prefs +!/.settings/org.eclipse.jdt.ui.prefs + +## netbeans ignores +nb-configuration.xml +nbactions.xml + +dependency-reduced-pom.xml +github.token + +## ignore attachment files +.local-* +*/.local-* diff --git a/dev-tools/ci b/dev-tools/ci index e94555388eb..df2f11e9a7f 100755 --- a/dev-tools/ci +++ b/dev-tools/ci @@ -109,26 +109,7 @@ fi # back to base directory cd "$BASE_DIR" -if ! grep -q -e '^xpack\.kibana\.build=false$' ~/.gradle/gradle.properties -then - # install the correct node.js version - if [ -z ${NVM_DIR:+x} ]; then - export NVM_DIR="/var/lib/jenkins/.nvm"; - fi - - NVM_SCRIPT="$NVM_DIR/nvm.sh" - if [ -s "$NVM_SCRIPT" ]; then - . "$NVM_SCRIPT" # load nvm - else - echo "Unable to find the nvm script at \"$NVM_SCRIPT\"" - exit 1 - fi - - echo "Installing node.js version $(cat ./kibana/.node-version)..." - nvm install "$(cat ./kibana/.node-version)" -fi - -echo "Running X-Plugins tests..." +echo "Running x-pack-elasticsearch tests..." echo "Running in $PWD" # output the commands