Remove compile-time dependency on test fixtures (#43651)

elastic · Jun 26, 2019 · 80fbe9c · 80fbe9c
1 parent 0d05ec4
commit 80fbe9c
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/x-pack/qa/kerberos-tests/build.gradle b/x-pack/qa/kerberos-tests/build.gradle
@@ -45,6 +45,12 @@ testClusters.integTest {
     user username: "test_kibana_user", password: "x-pack-test-password", role: "kibana_system"
 }
 
+task copyKeytabToGeneratedResources(type: Copy) {
+    from project(':test:fixtures:krb5kdc-fixture').ext.krb5Keytabs("peppa", "peppa.keytab")
+    into "$buildDir/generated-resources/keytabs"
+    dependsOn project(':test:fixtures:krb5kdc-fixture').postProcessFixture
+}
+
 String realm = "BUILD.ELASTIC.CO"
 integTest.runner {
     Path peppaKeytab = Paths.get("${project.buildDir}", "generated-resources", "keytabs", "peppa.keytab")
@@ -57,12 +63,5 @@ integTest.runner {
             "-Djava.security.krb5.conf=${project(':test:fixtures:krb5kdc-fixture').ext.krb5Conf("peppa")}",
             "-Dsun.security.krb5.debug=true"
     ])
+    classpath += copyKeytabToGeneratedResources.outputs.files
 }
-
-def generatedResources = "$buildDir/generated-resources/keytabs"
-task copyKeytabToGeneratedResources(type: Copy) {
-    from project(':test:fixtures:krb5kdc-fixture').ext.krb5Keytabs("peppa", "peppa.keytab")
-    into generatedResources
-    dependsOn project(':test:fixtures:krb5kdc-fixture').postProcessFixture
-}
-project.sourceSets.test.output.dir(generatedResources, builtBy:copyKeytabToGeneratedResources)