[test] Packaging test for aws plugin's parts

The AWS plugin was broken into discovery-ec2 and repository-s3 so we can't
test the old plugin and must test the new ones.

Fixed some wording issues in test names.

qa/vagrant/pom.xml

@@ -165,6 +165,12 @@
                                     <version>${elasticsearch.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.elasticsearch.plugin</groupId>
+                                    <artifactId>discovery-ec2</artifactId>
+                                    <version>${elasticsearch.version}</version>
+                                    <type>zip</type>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.elasticsearch.plugin</groupId>
                                     <artifactId>discovery-multicast</artifactId>
@@ -183,6 +189,12 @@
                                     <version>${elasticsearch.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.elasticsearch.plugin</groupId>
+                                    <artifactId>mapper-murmur3</artifactId>
+                                    <version>${elasticsearch.version}</version>
+                                    <type>zip</type>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.elasticsearch.plugin</groupId>
                                     <artifactId>mapper-size</artifactId>
@@ -191,7 +203,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.elasticsearch.plugin</groupId>
-                                    <artifactId>mapper-murmur3</artifactId>
+                                    <artifactId>repository-s3</artifactId>
                                     <version>${elasticsearch.version}</version>
                                     <type>zip</type>
                                 </artifactItem>

qa/vagrant/src/test/resources/packaging/scripts/plugin_test_cases.bash

@@ -153,10 +153,6 @@ fi
     install_and_check_plugin analysis stempel
 }
 
-@test "[$GROUP] install aws plugin" {
-    install_and_check_plugin cloud aws aws-java-sdk-core-*.jar
-}
-
 @test "[$GROUP] install azure plugin" {
     install_and_check_plugin cloud azure azure-core-*.jar
 }
@@ -165,10 +161,14 @@ fi
     install_and_check_plugin cloud gce google-api-client-*.jar
 }
 
-@test "[$GROUP] install delete by query" {
+@test "[$GROUP] install delete by query plugin" {
     install_and_check_plugin - delete-by-query
 }
 
+@test "[$GROUP] install ec2 discovery plugin" {
+    install_and_check_plugin discovery ec2 aws-java-sdk-core-*.jar
+}
+
 @test "[$GROUP] install multicast discovery plugin" {
     install_and_check_plugin discovery multicast
 }
@@ -181,14 +181,18 @@ fi
     install_and_check_plugin lang python jython-standalone-*.jar
 }
 
-@test "[$GROUP] install murmur3 mapper" {
+@test "[$GROUP] install murmur3 mapper plugin" {
     install_and_check_plugin mapper murmur3
 }
 
-@test "[$GROUP] install size mapper" {
+@test "[$GROUP] install size mapper plugin" {
     install_and_check_plugin mapper size
 }
 
+@test "[$GROUP] install s3 repository plugin" {
+    install_and_check_plugin repository s3 aws-java-sdk-core-*.jar
+}
+
 @test "[$GROUP] install site example" {
     # Doesn't use install_and_check_plugin because this is a site plugin
     install_plugin site-example $(readlink -m site-example-*.zip)
@@ -199,7 +203,7 @@ fi
     start_elasticsearch_service
 }
 
-@test "[$GROUP] check that the all bundled number of plugins are installed" {
+@test "[$GROUP] check the installed plugins matches the list of build plugins" {
     curl -s localhost:9200/_cat/plugins?h=c | sed 's/ *$//' |
         sort > /tmp/installed
     ls /elasticsearch/plugins/*/pom.xml | cut -d '/' -f 4 |
@@ -248,10 +252,14 @@ fi
     remove_plugin cloud-gce
 }
 
-@test "[$GROUP] remove delete by query" {
+@test "[$GROUP] remove delete by query plugin" {
     remove_plugin delete-by-query
 }
 
+@test "[$GROUP] remove ec2 discovery plugin" {
+    remove_plugin discovery-ec2
+}
+
 @test "[$GROUP] remove multicast discovery plugin" {
     remove_plugin discovery-multicast
 }
@@ -264,15 +272,19 @@ fi
     remove_plugin lang-python
 }
 
-@test "[$GROUP] remove murmur3 mapper" {
+@test "[$GROUP] remove murmur3 mapper plugin" {
     remove_plugin mapper-murmur3
 }
 
-@test "[$GROUP] remove size mapper" {
+@test "[$GROUP] remove size mapper plugin" {
     remove_plugin mapper-size
 }
 
-@test "[$GROUP] remove site example" {
+@test "[$GROUP] remove s3 repository plugin" {
+    remove_plugin repository-s3
+}
+
+@test "[$GROUP] remove site example plugin" {
     remove_plugin site-example
 }