Fixes for integ tests not using hardcoded ports

Original commit: elastic/x-pack-elasticsearch@9cc86da9e0

elasticsearch/qa/shield-audit-tests/build.gradle

@@ -13,7 +13,7 @@ integTest {
                  'bin/x-pack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
     waitCondition = { node, ant ->
       File tmpFile = new File(node.cwd, 'wait.success')
-      ant.get(src: "http://localhost:${node.httpPort()}",
+      ant.get(src: "http://${node.httpUri()}",
               dest: tmpFile.toString(),
               username: 'test_user',
               password: 'changeme',

elasticsearch/qa/shield-client-tests/build.gradle

@@ -13,7 +13,7 @@ integTest {
                  'bin/x-pack/esusers', 'useradd', 'transport', '-p', 'changeme', '-r', 'transport_client'
     waitCondition = { node, ant ->
       File tmpFile = new File(node.cwd, 'wait.success')
-      ant.get(src: "http://localhost:${node.httpPort()}",
+      ant.get(src: "http://${node.httpUri()}",
               dest: tmpFile.toString(),
               username: 'test_user',
               password: 'changeme',

elasticsearch/qa/shield-core-rest-tests/build.gradle

@@ -37,7 +37,7 @@ integTest {
                  'bin/x-pack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
     waitCondition = { node, ant ->
       File tmpFile = new File(node.cwd, 'wait.success')
-      ant.get(src: "http://localhost:${node.httpPort()}",
+      ant.get(src: "http://${node.httpUri()}",
               dest: tmpFile.toString(),
               username: 'test_user',
               password: 'changeme',

elasticsearch/qa/shield-example-realm/build.gradle

@@ -26,7 +26,7 @@ integTest {
                  'bin/x-pack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
     waitCondition = { node, ant ->
       File tmpFile = new File(node.cwd, 'wait.success')
-      ant.get(src: "http://localhost:${node.httpPort()}",
+      ant.get(src: "http://${node.httpUri()}",
               dest: tmpFile.toString(),
               username: 'test_user',
               password: 'changeme',

elasticsearch/qa/smoke-test-plugins-ssl/build.gradle

@@ -43,8 +43,6 @@ project.rootProject.subprojects.findAll { it.path.startsWith(':plugins:') }.each
 
 integTest {
   cluster {
-    // TODO: use some variable here for port number
-    systemProperty 'es.marvel.agent.exporter.es.hosts', 'https://marvel_export:changeme@localhost:9400'
     systemProperty 'es.marvel.agent.exporter.es.ssl.truststore.path', keystore.name
     systemProperty 'es.marvel.agent.exporter.es.ssl.truststore.password', 'keypass'
     systemProperty 'es.shield.transport.ssl', 'true'

elasticsearch/qa/smoke-test-plugins/build.gradle

@@ -21,7 +21,7 @@ integTest {
                  'bin/x-pack/esusers', 'useradd', 'test_user', '-p', 'changeme', '-r', 'admin'
     waitCondition = { node, ant ->
       File tmpFile = new File(node.cwd, 'wait.success')
-      ant.get(src: "http://localhost:${node.httpPort()}",
+      ant.get(src: "http://${node.httpUri()}",
               dest: tmpFile.toString(),
               username: 'test_user',
               password: 'changeme',

elasticsearch/qa/smoke-test-watcher-with-shield/build.gradle

@@ -28,7 +28,7 @@ integTest {
                  'bin/x-pack/esusers', 'useradd', 'powerless_user', '-p', 'changeme', '-r', 'crapy_role'
     waitCondition = { node, ant ->
       File tmpFile = new File(node.cwd, 'wait.success')
-      ant.get(src: "http://localhost:${node.httpPort()}",
+      ant.get(src: "http://${node.httpUri()}",
               dest: tmpFile.toString(),
               username: 'test_admin',
               password: 'changeme',

elasticsearch/x-pack/build.gradle

@@ -70,7 +70,6 @@ compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-
 
 ext.expansions = [
   'project.version': version,
-  'integ.http.port': integTest.cluster.baseHttpPort
 ]
 
 processResources {
@@ -117,14 +116,15 @@ bundlePlugin {
   from('watcher/bin/watcher') {
     into 'bin'
   }
+}
 
 integTest {
+  systemProperty 'tests.rest.blacklist', 'getting_started/10_monitor_cluster_health/*'
   cluster {
     // TODO set up tests so that shield can be enabled or disabled
     systemProperty 'es.shield.enabled', 'false'
   }
 }
-}
 
 // TODO: don't publish test artifacts just to run messy tests, fix the tests!
 // https://github.com/elastic/x-plugins/issues/724