From f96a6700c41af285cd82add9d7d314e574d1da59 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 24 Nov 2015 16:10:04 -0800 Subject: [PATCH] Build: Remove hack in shield+watcher rest test for copying config file Original commit: elastic/x-pack-elasticsearch@e31ef685d0d2c2fedcdf6f5f6863f57d7830338f --- qa/smoke-test-watcher-with-shield/build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qa/smoke-test-watcher-with-shield/build.gradle b/qa/smoke-test-watcher-with-shield/build.gradle index eb1568c4ce5..64db01497b7 100644 --- a/qa/smoke-test-watcher-with-shield/build.gradle +++ b/qa/smoke-test-watcher-with-shield/build.gradle @@ -12,9 +12,8 @@ task copyWatcherRestTests(type: Copy) { include 'rest-api-spec/test/**' } -integTest.dependsOn(copyWatcherRestTests) - integTest { + dependsOn copyWatcherRestTests systemProperty 'tests.rest.blacklist', ['hijack/10_basic/*', 'array_compare_watch/10_basic/Basic array_compare watch'].join(',') @@ -23,7 +22,7 @@ integTest { plugin 'license', project(':x-plugins:license:plugin') plugin 'shield', project(':x-plugins:shield') plugin 'watcher', project(':x-plugins:watcher') - extraConfigFile 'shield', 'roles.yml' + extraConfigFile 'shield/roles.yml', 'roles.yml' setupCommand 'setupTestAdminUser', 'bin/shield/esusers', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'admin' setupCommand 'setupWatcherManagerUser',