diff --git a/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash b/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash index ed5d7d0cea1..59ba4b1d364 100644 --- a/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash +++ b/qa/vagrant/src/test/resources/packaging/scripts/module_and_plugin_test_cases.bash @@ -220,6 +220,17 @@ fi install_and_check_plugin discovery ec2 aws-java-sdk-core-*.jar } +@test "[$GROUP] install ingest-attachment plugin" { + # we specify the version on the poi-3.13.jar so that the test does + # not spuriously pass if the jar is missing but the other poi jars + # are present + install_and_check_plugin ingest attachment bcprov-jdk15on-*.jar tika-core-*.jar pdfbox-*.jar poi-3.13.jar +} + +@test "[$GROUP] install ingest-geoip plugin" { + install_and_check_plugin ingest geoip geoip2-*.jar jackson-annotations-*.jar jackson-databind-*.jar maxmind-db-*.jar +} + @test "[$GROUP] check ingest-grok module" { check_module ingest-grok jcodings-*.jar joni-*.jar } @@ -266,6 +277,10 @@ fi check_module reindex } +@test "[$GROUP] install repository-hdfs plugin" { + install_and_check_plugin repository hdfs hadoop-client-*.jar hadoop-common-*.jar hadoop-annotations-*.jar hadoop-auth-*.jar hadoop-hdfs-*.jar htrace-core-*.jar guava-*.jar protobuf-java-*.jar commons-logging-*.jar commons-cli-*.jar commons-collections-*.jar commons-configuration-*.jar commons-io-*.jar commons-lang-*.jar servlet-api-*.jar slf4j-api-*.jar +} + @test "[$GROUP] install size mapper plugin" { install_and_check_plugin mapper size } @@ -340,6 +355,14 @@ fi remove_plugin discovery-ec2 } +@test "[$GROUP] remove ingest-attachment plugin" { + remove_plugin ingest-attachment +} + +@test "[$GROUP] remove ingest-geoip plugin" { + remove_plugin ingest-geoip +} + @test "[$GROUP] remove javascript plugin" { remove_plugin lang-javascript } @@ -364,6 +387,10 @@ fi remove_plugin repository-azure } +@test "[$GROUP] remove repository-hdfs plugin" { + remove_plugin repository-hdfs +} + @test "[$GROUP] remove repository-s3 plugin" { remove_plugin repository-s3 } diff --git a/qa/vagrant/src/test/resources/packaging/scripts/plugins.bash b/qa/vagrant/src/test/resources/packaging/scripts/plugins.bash index 8a32c982af1..f58c6a92417 100644 --- a/qa/vagrant/src/test/resources/packaging/scripts/plugins.bash +++ b/qa/vagrant/src/test/resources/packaging/scripts/plugins.bash @@ -32,7 +32,7 @@ install_plugin() { assert_file_exist "$path" - sudo -E -u $ESPLUGIN_COMMAND_USER "$ESHOME/bin/elasticsearch-plugin" install "file://$path" + sudo -E -u $ESPLUGIN_COMMAND_USER "$ESHOME/bin/elasticsearch-plugin" install -batch "file://$path" assert_file_exist "$ESPLUGINS/$name" assert_file_exist "$ESPLUGINS/$name/plugin-descriptor.properties"