Optimise gradle task TestSql
This commit is contained in:
@@ -121,8 +121,8 @@ val testSql by tasks.registering {
|
|||||||
group = "verification"
|
group = "verification"
|
||||||
dependsOn(tasks.named("processResources"))
|
dependsOn(tasks.named("processResources"))
|
||||||
dependsOn(tasks.named("processTestResources"))
|
dependsOn(tasks.named("processTestResources"))
|
||||||
dependsOn(tasks.named("testComposeUp"))
|
dependsOn(tasks.named("testSqlComposeUp"))
|
||||||
finalizedBy(tasks.named("testComposeDown"))
|
finalizedBy(tasks.named("testSqlComposeDown"))
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
val config = ConfigFactory.parseFile(file("$buildDir/resources/test/application-test.conf")).resolve()
|
val config = ConfigFactory.parseFile(file("$buildDir/resources/test/application-test.conf")).resolve()
|
||||||
@@ -218,13 +218,22 @@ dockerCompose {
|
|||||||
removeVolumes = false
|
removeVolumes = false
|
||||||
removeContainers = false
|
removeContainers = false
|
||||||
isRequiredBy(project.tasks.run)
|
isRequiredBy(project.tasks.run)
|
||||||
|
|
||||||
|
createNested("testSql").apply {
|
||||||
|
projectName = "dc-project_test"
|
||||||
|
useComposeFiles = listOf("docker-compose-test.yml")
|
||||||
|
startedServices = listOf("db", "elasticsearch")
|
||||||
|
stopContainers = false
|
||||||
|
isRequiredBy(project.tasks.named("testSql"))
|
||||||
|
}
|
||||||
|
|
||||||
createNested("test").apply {
|
createNested("test").apply {
|
||||||
projectName = "dc-project_test"
|
projectName = "dc-project_test"
|
||||||
useComposeFiles = listOf("docker-compose-test.yml")
|
useComposeFiles = listOf("docker-compose-test.yml")
|
||||||
stopContainers = false
|
stopContainers = false
|
||||||
isRequiredBy(project.tasks.test)
|
isRequiredBy(project.tasks.test)
|
||||||
isRequiredBy(project.tasks.named("testSql"))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
createNested("sonarqube").apply {
|
createNested("sonarqube").apply {
|
||||||
projectName = "dc-project"
|
projectName = "dc-project"
|
||||||
useComposeFiles = listOf("docker-compose-sonar.yml")
|
useComposeFiles = listOf("docker-compose-sonar.yml")
|
||||||
|
|||||||
Reference in New Issue
Block a user